better setting handling, position setting

src/commands/self_roles/mod.rs

@@ -39,11 +39,17 @@ pub async fn edit_role<'a, E>(ctx: Context<'a>, user: UserId, guild: GuildId, ed
 }
 
 async fn create_role<'a, E>(ctx: Context<'a>, user: UserId, guild: GuildId, edit: EditRole<'a>, db: E) -> Result<RoleId, Error>
-    where E: PgExecutor<'a>,
+    where E: PgExecutor<'a> + Clone,
 {
     let def = EditRole::new()
         .name(user.to_user(ctx).await?.name)
-        .permissions(Permissions::empty());
+        .permissions(Permissions::empty())
+        .position({
+            match crate::commands::settings::get_positional_role(ctx, guild).await? {
+                Some(role) => guild.role(ctx, role).await?.position,
+                None => 0u16,
+            }
+        });
 
     let member = guild.member(ctx, user).await?;
 

src/commands/settings.rs

@@ -1,7 +1,20 @@
 use crate::common::{Context, Error};
 
-#[poise::command(prefix_command, slash_command, required_permissions = "MANAGE_GUILD")]
+use poise::serenity_prelude::{Role, RoleId, GuildId};
-async fn prefix(ctx: Context<'_>, prefix: String) -> Result<(), Error> {
+use sqlx::Row;
+
+async fn get_prefix(ctx: Context<'_>, guild: GuildId) -> Result<Option<String>, Error> {
+    let db = &ctx.data().database;
+
+    let prefix: Option<String> = sqlx::query("SELECT prefix FROM settings WHERE guildid = $1")
+        .bind(guild.get() as i64)
+        .fetch_one(db).await?.get(0);
+
+    Ok(prefix.or(ctx.data().prefix.clone()))
+}
+
+#[poise::command(prefix_command, slash_command)]
+async fn prefix(ctx: Context<'_>, prefix: Option<String>) -> Result<(), Error> {
     let guild = match ctx.guild_id() {
         Some(g) => g,
         None => {
@@ -10,21 +23,85 @@ async fn prefix(ctx: Context<'_>, prefix: String) -> Result<(), Error> {
         }
     };
 
-    let mut tx = ctx.data().database.begin().await?;
+    match prefix {
+        Some(prefix) => {
+            if !ctx.author_member().await.unwrap().permissions.iter().any(|p| p.manage_guild()) {
+                ctx.reply("You do not have permission to change this setting.").await?;
+                return Ok(());
+            }
 
-    sqlx::query("INSERT INTO settings (guildid, prefix) VALUES ($1, $2) ON CONFLICT (guildid) DO UPDATE SET prefix = EXCLUDED.prefix")
+            let mut tx = ctx.data().database.begin().await?;
-        .bind(guild.get() as i64)
-        .bind(&prefix)
-        .execute(&mut *tx).await?;
 
-    tx.commit().await?;
+            sqlx::query("INSERT INTO settings (guildid, prefix) VALUES ($1, $2) ON CONFLICT (guildid) DO UPDATE SET prefix = EXCLUDED.prefix")
-
+                .bind(guild.get() as i64)
-    ctx.reply(format!("This server's custom prefix has been updated to `{prefix}`.")).await?;
+                .bind(&prefix)
+                .execute(&mut *tx).await?;
+        
+            tx.commit().await?;
+        
+            ctx.reply(format!("This server's custom prefix has been updated to `{prefix}`.")).await?;
+        }
+        None => {
+            let s = get_prefix(ctx, guild).await?.map(|s| format!("`{s}`")).unwrap_or("not set".into());
+            ctx.reply(format!("This server's command prefix is {s}.")).await?;
+        }
+    }
 
     Ok(())
 }
 
-#[poise::command(prefix_command, slash_command, subcommands("prefix"), subcommand_required)]
+pub async fn get_positional_role(ctx: Context<'_>, guild: GuildId) -> Result<Option<RoleId>, Error> {
+    let db = &ctx.data().database;
+
+    let role: Option<i64> = sqlx::query("SELECT positional_role FROM settings WHERE guildid = $1")
+        .bind(guild.get() as i64)
+        .fetch_one(db).await?.get(0);
+
+    Ok(role.map(|sf| RoleId::new(sf as u64)))
+}
+
+#[poise::command(prefix_command, slash_command)]
+pub async fn position(ctx: Context<'_>, role: Option<Role>) -> Result<(), Error> {
+    let guild = match ctx.guild_id() {
+        Some(g) => g,
+        None => {
+            ctx.reply("This command must be ran within a guild.").await?;
+            return Ok(());
+        }
+    };
+
+    if !ctx.author_member().await.unwrap().permissions.iter().any(|p| p.manage_guild()) {
+        ctx.reply("You do not have permission to see or change this setting.").await?;
+        return Ok(());
+    }
+
+    match role {
+        Some(role) => {
+            let mut tx = ctx.data().database.begin().await?;
+
+            sqlx::query("INSERT INTO settings (guildid, positional_role) VALUES ($1, $2) ON CONFLICT (guildid) DO UPDATE SET positional_role = EXCLUDED.positional_role")
+                .bind(guild.get() as i64)
+                .bind(role.id.get() as i64)
+                .execute(&mut *tx).await?;
+
+            tx.commit().await?;
+
+            ctx.reply(format!("The bot will now place newly created self roles below `{role}`.")).await?;
+        }
+        None => {
+            let s = match get_positional_role(ctx, guild).await? {
+                Some(r) => format!("{}", guild.role(ctx, r).await?),
+                None => "not set".into()
+            };
+
+            ctx.reply(format!("This server's positional role is {s}.")).await?;
+        }
+    }
+
+    Ok(())
+}
+
+#[poise::command(prefix_command, slash_command, subcommands("prefix", "position"), subcommand_required)]
 pub async fn setting(_ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
 }

src/main.rs

@@ -62,12 +62,11 @@ async fn get_prefix(ctx: PartialContext<'_, Data, Error>) -> Result<Option<Strin
 
     let db = &ctx.data.database;
 
-    let prefix = sqlx::query("SELECT prefix FROM settings WHERE guildid = $1")
+    let prefix: Option<String> = sqlx::query("SELECT prefix FROM settings WHERE guildid = $1")
         .bind(guild.get() as i64)
-        .fetch_one(db).await.ok()
+        .fetch_one(db).await?.get(0);
-            .map(|x| x.get(0)).unwrap_or(ctx.data.prefix.clone());
 
-    Ok(prefix)
+    Ok(prefix.or(ctx.data.prefix.clone()))
 }
 
 #[tokio::main]
@@ -164,6 +163,7 @@ async fn main() -> Result<(), Error> {
                     r#"
                     CREATE TABLE IF NOT EXISTS settings (
                         guildid BIGINT NOT NULL PRIMARY KEY,
+                        positional_role BIGINT,
                         prefix TEXT
                     )
                     "#