improve settingscreator

Anti-Raid · Nov 20, 2024 · 66af77e · 66af77e
1 parent 2a73e1f
commit 66af77e
Show file tree

Hide file tree

Showing 41 changed files with 829 additions and 825 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/rust.binutils/Cargo.lock b/core/rust.binutils/Cargo.lock
diff --git a/core/rust.bot_modules.core/Cargo.lock b/core/rust.bot_modules.core/Cargo.lock
diff --git a/core/rust.bot_modules.core/Cargo.toml b/core/rust.bot_modules.core/Cargo.toml
@@ -23,7 +23,7 @@ permission_checks = { path = "../rust.permissions.checks" }
 config = { path = "../rust.config" }
 sandwich_driver = { path = "../rust.sandwich_driver" }
 rust_buildstats = { path = "../rust.buildstats" }
-module_settings = { path = "../rust.module_settings" }
+ar_settings = { path = "../rust.settings" }
 splashcore_rs = { path = "../rust.std" }
 templating = { path = "../rust.templating" }
 gwevent = { path = "../rust.gwevent" }

diff --git a/core/rust.bot_modules.core/src/lib.rs b/core/rust.bot_modules.core/src/lib.rs
@@ -123,7 +123,7 @@ impl silverpelt::module::Module for Module {
         ]
     }
 
-    fn config_options(&self) -> Vec<module_settings::types::Setting> {
+    fn config_options(&self) -> Vec<ar_settings::types::Setting> {
         vec![
             (*settings::GUILD_ROLES).clone(),
             (*settings::GUILD_MEMBERS).clone(),

diff --git a/core/rust.bot_modules.core/src/settings.rs b/core/rust.bot_modules.core/src/settings.rs
@@ -1,7 +1,7 @@
 use kittycat::perms::Permission;
-use module_settings::state::State;
-use module_settings::types::SettingsData;
-use module_settings::{
+use ar_settings::state::State;
+use ar_settings::types::SettingsData;
+use ar_settings::{
     data_stores::{PostgresDataStore, PostgresDataStoreImpl},
     types::{
         settings_wrap, Column, ColumnSuggestion, ColumnType, Setting, HookContext,
@@ -27,7 +27,7 @@ pub static GUILD_ROLES: LazyLock<Setting> = LazyLock::new(|| {
         max_return: 20,
         data_store: settings_wrap(PostgresDataStore {}),
         columns: settings_wrap(vec![
-            module_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
             Column {
                 id: "role_id",
                 name: "Role ID",
@@ -91,10 +91,10 @@ pub static GUILD_ROLES: LazyLock<Setting> = LazyLock::new(|| {
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::created_at(),
-            module_settings::common_columns::created_by(),
-            module_settings::common_columns::last_updated_at(),
-            module_settings::common_columns::last_updated_by(),
+            ar_settings::common_columns::created_at(),
+            ar_settings::common_columns::created_by(),
+            ar_settings::common_columns::last_updated_at(),
+            ar_settings::common_columns::last_updated_by(),
         ]),
         title_template: "{index} - {role_id}",
         operations: indexmap::indexmap! {
@@ -566,7 +566,7 @@ pub static GUILD_MEMBERS: LazyLock<Setting> = LazyLock::new(|| {
         max_return: 20,
         data_store: settings_wrap(PostgresDataStore {}),
         columns: settings_wrap(vec![
-            module_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
             Column {
                 id: "user_id",
                 name: "User ID",
@@ -659,7 +659,7 @@ pub static GUILD_MEMBERS: LazyLock<Setting> = LazyLock::new(|| {
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::created_at(),
+            ar_settings::common_columns::created_at(),
         ]),
         title_template: "{user_id}, perm_overrides={perm_overrides}",
         operations: indexmap::indexmap! {
@@ -939,7 +939,7 @@ pub static GUILD_TEMPLATES: LazyLock<Setting> = LazyLock::new(|| {
         max_return: 10,
         data_store: settings_wrap(PostgresDataStore {}),
         columns: settings_wrap(vec![
-            module_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
             Column {
                 id: "name",
                 name: "Name",
@@ -988,10 +988,10 @@ pub static GUILD_TEMPLATES: LazyLock<Setting> = LazyLock::new(|| {
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::created_at(),
-            module_settings::common_columns::created_by(),
-            module_settings::common_columns::last_updated_at(),
-            module_settings::common_columns::last_updated_by(),
+            ar_settings::common_columns::created_at(),
+            ar_settings::common_columns::created_by(),
+            ar_settings::common_columns::last_updated_at(),
+            ar_settings::common_columns::last_updated_by(),
         ]),
         title_template: "{name}",
         operations: indexmap::indexmap! {
@@ -1081,7 +1081,7 @@ pub struct GuildTemplatePostAction;
 
 #[async_trait::async_trait]
 impl PostAction for GuildTemplatePostAction {
-    async fn post_action<'a>(&self, context: HookContext<'a> , state: &'a mut module_settings::state::State) -> Result<(), SettingsError> {
+    async fn post_action<'a>(&self, context: HookContext<'a> , state: &'a mut ar_settings::state::State) -> Result<(), SettingsError> {
         if context.operation_type == OperationType::View {
             return Ok(())
         }
@@ -1132,7 +1132,7 @@ pub static GUILD_TEMPLATES_KV: LazyLock<Setting> = LazyLock::new(|| {
         max_return: 10,
         data_store: settings_wrap(PostgresDataStore {}),
         columns: settings_wrap(vec![
-            module_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::guild_id("guild_id", "Guild ID", "The Guild ID"),
             Column {
                 id: "key",
                 name: "Key",
@@ -1164,8 +1164,8 @@ pub static GUILD_TEMPLATES_KV: LazyLock<Setting> = LazyLock::new(|| {
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::created_at(),
-            module_settings::common_columns::last_updated_at(),
+            ar_settings::common_columns::created_at(),
+            ar_settings::common_columns::last_updated_at(),
         ]),
         title_template: "{key}",
         operations: indexmap::indexmap! {
@@ -1306,11 +1306,11 @@ pub static GUILD_TEMPLATE_SHOP: LazyLock<Setting> = LazyLock::new(|| {
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::guild_id("owner_guild", "Guild ID", "The Guild ID"),
-            module_settings::common_columns::created_at(),
-            module_settings::common_columns::created_by(),
-            module_settings::common_columns::last_updated_at(),
-            module_settings::common_columns::last_updated_by(),
+            ar_settings::common_columns::guild_id("owner_guild", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::created_at(),
+            ar_settings::common_columns::created_by(),
+            ar_settings::common_columns::last_updated_at(),
+            ar_settings::common_columns::last_updated_by(),
         ]),
         title_template: "{name}",
         operations: indexmap::indexmap! {
@@ -1452,11 +1452,11 @@ pub static GUILD_TEMPLATE_SHOP_PUBLIC_LIST: LazyLock<Setting> = LazyLock::new(||
                 ignored_for: vec![],
                 secret: false,
             },
-            module_settings::common_columns::guild_id("owner_guild", "Guild ID", "The Guild ID"),
-            module_settings::common_columns::created_at(),
-            module_settings::common_columns::created_by(),
-            module_settings::common_columns::last_updated_at(),
-            module_settings::common_columns::last_updated_by(),
+            ar_settings::common_columns::guild_id("owner_guild", "Guild ID", "The Guild ID"),
+            ar_settings::common_columns::created_at(),
+            ar_settings::common_columns::created_by(),
+            ar_settings::common_columns::last_updated_at(),
+            ar_settings::common_columns::last_updated_by(),
         ]),
         title_template: "{name}",
         operations: indexmap::indexmap! {

diff --git a/core/rust.bot_modules.hooks/Cargo.lock b/core/rust.bot_modules.hooks/Cargo.lock
diff --git a/core/rust.bot_modules.hooks/Cargo.toml b/core/rust.bot_modules.hooks/Cargo.toml
@@ -24,7 +24,6 @@ async-trait = "0.1"
 silverpelt = { path = "../rust.silverpelt" }
 splashcore_rs = { path = "../rust.std" }
 permissions = { path = "../rust.permissions" }
-module_settings = { path = "../rust.module_settings" }
 gwevent = { path = "../rust.gwevent" }
 templating = { path = "../rust.templating" }