From e92c6035fde27b8f48f36a856eff042cb7ecda04 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 4 May 2023 15:31:38 +0300 Subject: [PATCH] move source to workspace member --- Cargo.toml | 24 ++++-------------- mixer-discord-bot/Cargo.toml | 20 +++++++++++++++ .../assets}/fonts/big-noodle-titling.ttf | Bin .../assets}/fonts/big-noodle-too-oblique.ttf | Bin .../assets}/images/teams.png | Bin schema.sql => mixer-discord-bot/schema.sql | 0 .../src}/algorithm/glicko2.rs | 0 .../src}/algorithm/mod.rs | 0 .../src}/bot/commands/creator.rs | 0 .../src}/bot/commands/lobby.rs | 0 .../src}/bot/commands/mod.rs | 0 .../src}/bot/commands/ping.rs | 0 .../src}/bot/commands/preference.rs | 0 .../src}/bot/commands/rating.rs | 0 .../src}/bot/commands/settings.rs | 0 .../src}/bot/handlers/command_handler.rs | 0 .../src}/bot/handlers/mod.rs | 0 .../src}/bot/interactions/mod.rs | 0 {src => mixer-discord-bot/src}/bot/mod.rs | 0 .../src}/database/mod.rs | 0 .../src}/database/models/guild.rs | 0 .../src}/database/models/lobby.rs | 0 .../src}/database/models/mod.rs | 0 .../src}/database/models/player.rs | 0 .../src}/database/models/prelude.rs | 0 .../src}/database/models/role.rs | 0 .../src}/database/queries/guild.rs | 0 .../src}/database/queries/lobby.rs | 0 .../src}/database/queries/mod.rs | 0 .../src}/database/queries/player.rs | 0 .../src}/database/queries/prelude.rs | 0 .../src}/image_manipulation.rs | 0 {src => mixer-discord-bot/src}/main.rs | 0 {src => mixer-discord-bot/src}/mixer/mixer.rs | 0 {src => mixer-discord-bot/src}/mixer/mod.rs | 0 .../src}/mixer/player.rs | 0 .../src}/mixer/rating.rs | 0 {src => mixer-discord-bot/src}/mixer/team.rs | 0 38 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 mixer-discord-bot/Cargo.toml rename {assets => mixer-discord-bot/assets}/fonts/big-noodle-titling.ttf (100%) rename {assets => mixer-discord-bot/assets}/fonts/big-noodle-too-oblique.ttf (100%) rename {assets => mixer-discord-bot/assets}/images/teams.png (100%) rename schema.sql => mixer-discord-bot/schema.sql (100%) rename {src => mixer-discord-bot/src}/algorithm/glicko2.rs (100%) rename {src => mixer-discord-bot/src}/algorithm/mod.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/creator.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/lobby.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/mod.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/ping.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/preference.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/rating.rs (100%) rename {src => mixer-discord-bot/src}/bot/commands/settings.rs (100%) rename {src => mixer-discord-bot/src}/bot/handlers/command_handler.rs (100%) rename {src => mixer-discord-bot/src}/bot/handlers/mod.rs (100%) rename {src => mixer-discord-bot/src}/bot/interactions/mod.rs (100%) rename {src => mixer-discord-bot/src}/bot/mod.rs (100%) rename {src => mixer-discord-bot/src}/database/mod.rs (100%) rename {src => mixer-discord-bot/src}/database/models/guild.rs (100%) rename {src => mixer-discord-bot/src}/database/models/lobby.rs (100%) rename {src => mixer-discord-bot/src}/database/models/mod.rs (100%) rename {src => mixer-discord-bot/src}/database/models/player.rs (100%) rename {src => mixer-discord-bot/src}/database/models/prelude.rs (100%) rename {src => mixer-discord-bot/src}/database/models/role.rs (100%) rename {src => mixer-discord-bot/src}/database/queries/guild.rs (100%) rename {src => mixer-discord-bot/src}/database/queries/lobby.rs (100%) rename {src => mixer-discord-bot/src}/database/queries/mod.rs (100%) rename {src => mixer-discord-bot/src}/database/queries/player.rs (100%) rename {src => mixer-discord-bot/src}/database/queries/prelude.rs (100%) rename {src => mixer-discord-bot/src}/image_manipulation.rs (100%) rename {src => mixer-discord-bot/src}/main.rs (100%) rename {src => mixer-discord-bot/src}/mixer/mixer.rs (100%) rename {src => mixer-discord-bot/src}/mixer/mod.rs (100%) rename {src => mixer-discord-bot/src}/mixer/player.rs (100%) rename {src => mixer-discord-bot/src}/mixer/rating.rs (100%) rename {src => mixer-discord-bot/src}/mixer/team.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index aa81d09..1d2b629 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,6 @@ -[package] -name = "mixer-discord-bot" -version = "0.1.0" -edition = "2021" +[workspace] -[dependencies] -tokio = { version = "*", features = ["full"] } -tracing = "*" -serenity = {version = "*", default-features = false, features = ["rustls_backend", "client", "gateway", "model", "cache", "collector", "utils"] } -sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] } -sea-orm = { version = "*", features = ["sqlx-postgres", "runtime-tokio-native-tls", "macros"] } -itertools = "*" -shuttle-secrets = "*" -shuttle-serenity = "*" -shuttle-runtime = "*" -shuttle-shared-db = { version = "*", features = ["postgres"] } - -rusttype = "*" -image = "*" -imageproc = "*" \ No newline at end of file +members = [ + "mixer-discord-bot" +] +default-members = ["mixer-discord-bot"] \ No newline at end of file diff --git a/mixer-discord-bot/Cargo.toml b/mixer-discord-bot/Cargo.toml new file mode 100644 index 0000000..aa81d09 --- /dev/null +++ b/mixer-discord-bot/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "mixer-discord-bot" +version = "0.1.0" +edition = "2021" + +[dependencies] +tokio = { version = "*", features = ["full"] } +tracing = "*" +serenity = {version = "*", default-features = false, features = ["rustls_backend", "client", "gateway", "model", "cache", "collector", "utils"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] } +sea-orm = { version = "*", features = ["sqlx-postgres", "runtime-tokio-native-tls", "macros"] } +itertools = "*" +shuttle-secrets = "*" +shuttle-serenity = "*" +shuttle-runtime = "*" +shuttle-shared-db = { version = "*", features = ["postgres"] } + +rusttype = "*" +image = "*" +imageproc = "*" \ No newline at end of file diff --git a/assets/fonts/big-noodle-titling.ttf b/mixer-discord-bot/assets/fonts/big-noodle-titling.ttf similarity index 100% rename from assets/fonts/big-noodle-titling.ttf rename to mixer-discord-bot/assets/fonts/big-noodle-titling.ttf diff --git a/assets/fonts/big-noodle-too-oblique.ttf b/mixer-discord-bot/assets/fonts/big-noodle-too-oblique.ttf similarity index 100% rename from assets/fonts/big-noodle-too-oblique.ttf rename to mixer-discord-bot/assets/fonts/big-noodle-too-oblique.ttf diff --git a/assets/images/teams.png b/mixer-discord-bot/assets/images/teams.png similarity index 100% rename from assets/images/teams.png rename to mixer-discord-bot/assets/images/teams.png diff --git a/schema.sql b/mixer-discord-bot/schema.sql similarity index 100% rename from schema.sql rename to mixer-discord-bot/schema.sql diff --git a/src/algorithm/glicko2.rs b/mixer-discord-bot/src/algorithm/glicko2.rs similarity index 100% rename from src/algorithm/glicko2.rs rename to mixer-discord-bot/src/algorithm/glicko2.rs diff --git a/src/algorithm/mod.rs b/mixer-discord-bot/src/algorithm/mod.rs similarity index 100% rename from src/algorithm/mod.rs rename to mixer-discord-bot/src/algorithm/mod.rs diff --git a/src/bot/commands/creator.rs b/mixer-discord-bot/src/bot/commands/creator.rs similarity index 100% rename from src/bot/commands/creator.rs rename to mixer-discord-bot/src/bot/commands/creator.rs diff --git a/src/bot/commands/lobby.rs b/mixer-discord-bot/src/bot/commands/lobby.rs similarity index 100% rename from src/bot/commands/lobby.rs rename to mixer-discord-bot/src/bot/commands/lobby.rs diff --git a/src/bot/commands/mod.rs b/mixer-discord-bot/src/bot/commands/mod.rs similarity index 100% rename from src/bot/commands/mod.rs rename to mixer-discord-bot/src/bot/commands/mod.rs diff --git a/src/bot/commands/ping.rs b/mixer-discord-bot/src/bot/commands/ping.rs similarity index 100% rename from src/bot/commands/ping.rs rename to mixer-discord-bot/src/bot/commands/ping.rs diff --git a/src/bot/commands/preference.rs b/mixer-discord-bot/src/bot/commands/preference.rs similarity index 100% rename from src/bot/commands/preference.rs rename to mixer-discord-bot/src/bot/commands/preference.rs diff --git a/src/bot/commands/rating.rs b/mixer-discord-bot/src/bot/commands/rating.rs similarity index 100% rename from src/bot/commands/rating.rs rename to mixer-discord-bot/src/bot/commands/rating.rs diff --git a/src/bot/commands/settings.rs b/mixer-discord-bot/src/bot/commands/settings.rs similarity index 100% rename from src/bot/commands/settings.rs rename to mixer-discord-bot/src/bot/commands/settings.rs diff --git a/src/bot/handlers/command_handler.rs b/mixer-discord-bot/src/bot/handlers/command_handler.rs similarity index 100% rename from src/bot/handlers/command_handler.rs rename to mixer-discord-bot/src/bot/handlers/command_handler.rs diff --git a/src/bot/handlers/mod.rs b/mixer-discord-bot/src/bot/handlers/mod.rs similarity index 100% rename from src/bot/handlers/mod.rs rename to mixer-discord-bot/src/bot/handlers/mod.rs diff --git a/src/bot/interactions/mod.rs b/mixer-discord-bot/src/bot/interactions/mod.rs similarity index 100% rename from src/bot/interactions/mod.rs rename to mixer-discord-bot/src/bot/interactions/mod.rs diff --git a/src/bot/mod.rs b/mixer-discord-bot/src/bot/mod.rs similarity index 100% rename from src/bot/mod.rs rename to mixer-discord-bot/src/bot/mod.rs diff --git a/src/database/mod.rs b/mixer-discord-bot/src/database/mod.rs similarity index 100% rename from src/database/mod.rs rename to mixer-discord-bot/src/database/mod.rs diff --git a/src/database/models/guild.rs b/mixer-discord-bot/src/database/models/guild.rs similarity index 100% rename from src/database/models/guild.rs rename to mixer-discord-bot/src/database/models/guild.rs diff --git a/src/database/models/lobby.rs b/mixer-discord-bot/src/database/models/lobby.rs similarity index 100% rename from src/database/models/lobby.rs rename to mixer-discord-bot/src/database/models/lobby.rs diff --git a/src/database/models/mod.rs b/mixer-discord-bot/src/database/models/mod.rs similarity index 100% rename from src/database/models/mod.rs rename to mixer-discord-bot/src/database/models/mod.rs diff --git a/src/database/models/player.rs b/mixer-discord-bot/src/database/models/player.rs similarity index 100% rename from src/database/models/player.rs rename to mixer-discord-bot/src/database/models/player.rs diff --git a/src/database/models/prelude.rs b/mixer-discord-bot/src/database/models/prelude.rs similarity index 100% rename from src/database/models/prelude.rs rename to mixer-discord-bot/src/database/models/prelude.rs diff --git a/src/database/models/role.rs b/mixer-discord-bot/src/database/models/role.rs similarity index 100% rename from src/database/models/role.rs rename to mixer-discord-bot/src/database/models/role.rs diff --git a/src/database/queries/guild.rs b/mixer-discord-bot/src/database/queries/guild.rs similarity index 100% rename from src/database/queries/guild.rs rename to mixer-discord-bot/src/database/queries/guild.rs diff --git a/src/database/queries/lobby.rs b/mixer-discord-bot/src/database/queries/lobby.rs similarity index 100% rename from src/database/queries/lobby.rs rename to mixer-discord-bot/src/database/queries/lobby.rs diff --git a/src/database/queries/mod.rs b/mixer-discord-bot/src/database/queries/mod.rs similarity index 100% rename from src/database/queries/mod.rs rename to mixer-discord-bot/src/database/queries/mod.rs diff --git a/src/database/queries/player.rs b/mixer-discord-bot/src/database/queries/player.rs similarity index 100% rename from src/database/queries/player.rs rename to mixer-discord-bot/src/database/queries/player.rs diff --git a/src/database/queries/prelude.rs b/mixer-discord-bot/src/database/queries/prelude.rs similarity index 100% rename from src/database/queries/prelude.rs rename to mixer-discord-bot/src/database/queries/prelude.rs diff --git a/src/image_manipulation.rs b/mixer-discord-bot/src/image_manipulation.rs similarity index 100% rename from src/image_manipulation.rs rename to mixer-discord-bot/src/image_manipulation.rs diff --git a/src/main.rs b/mixer-discord-bot/src/main.rs similarity index 100% rename from src/main.rs rename to mixer-discord-bot/src/main.rs diff --git a/src/mixer/mixer.rs b/mixer-discord-bot/src/mixer/mixer.rs similarity index 100% rename from src/mixer/mixer.rs rename to mixer-discord-bot/src/mixer/mixer.rs diff --git a/src/mixer/mod.rs b/mixer-discord-bot/src/mixer/mod.rs similarity index 100% rename from src/mixer/mod.rs rename to mixer-discord-bot/src/mixer/mod.rs diff --git a/src/mixer/player.rs b/mixer-discord-bot/src/mixer/player.rs similarity index 100% rename from src/mixer/player.rs rename to mixer-discord-bot/src/mixer/player.rs diff --git a/src/mixer/rating.rs b/mixer-discord-bot/src/mixer/rating.rs similarity index 100% rename from src/mixer/rating.rs rename to mixer-discord-bot/src/mixer/rating.rs diff --git a/src/mixer/team.rs b/mixer-discord-bot/src/mixer/team.rs similarity index 100% rename from src/mixer/team.rs rename to mixer-discord-bot/src/mixer/team.rs