eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix SQLX errors

Browse Source
This commit is contained in:
Geometrically
2020-12-31 19:09:23 -07:00
parent 0efeffeaa3
commit b8d2ef1eb5
4 changed files with 728 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1087
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
Cargo.toml
View File

@@ -43,14 +43,4 @@ futures-timer = "3.0.2"
rust-s3 = "0.26.1" rust-s3 = "0.26.1"
async-trait = "0.1.41" async-trait = "0.1.41"
[dependencies.sqlx] sqlx = { version = "0.4.2", features = ["runtime-actix-rustls", "postgres", "chrono", "offline", "macros", "migrate"] }
git = "https://github.com/launchbadge/sqlx/"
branch = "master"
default-features = false
features = ["runtime-actix", "postgres", "chrono", "offline", "macros", "migrate"]
[dependencies.sqlx-macros]
git = "https://github.com/launchbadge/sqlx/"
branch = "master"
default-features = false
features = ["runtime-actix", "postgres", "chrono", "offline"]

2
src/database/models/ids.rs
View File

@@ -1,6 +1,6 @@
use super::DatabaseError; use super::DatabaseError;
use crate::models::ids::random_base62_rng; use crate::models::ids::random_base62_rng;
use sqlx_macros::Type; use sqlx::sqlx_macros::Type;
const ID_RETRY_COUNT: usize = 20; const ID_RETRY_COUNT: usize = 20;

2
src/main.rs
View File

@@ -264,7 +264,7 @@ async fn main() -> std::io::Result<()> {
let ignore_ips = dotenv::var("RATE_LIMIT_IGNORE_IPS") let ignore_ips = dotenv::var("RATE_LIMIT_IGNORE_IPS")
.ok() .ok()
.and_then(|s| serde_json::from_str::<Vec<String>>(&s).ok()) .and_then(|s| serde_json::from_str::<Vec<String>>(&s).ok())
.unwrap_or_else(|| vec![]); .unwrap_or(vec![]);
if ignore_ips.contains(&ip) { if ignore_ips.contains(&ip) {
// At an even distribution of numbers, this will allow at the most // At an even distribution of numbers, this will allow at the most