switch to main dash rs

the servers correctly support 2.2 now so the fork is unnecessary

Author: qimiko

Cargo.lock

@@ -12,7 +12,7 @@ rocket = {version = "0.5.1", features = ["json"]}
 pointercrate-core = {path = "../pointercrate-core"}
 pointercrate-core-pages = {path = "../pointercrate-core-pages"}
 serde_json = "1.0.118"
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
 log = "0.4.22"
 serde_urlencoded = "0.7.0"
 maud = "0.26.0"

pointercrate-core-api/Cargo.toml

@@ -9,6 +9,6 @@ edition.workspace = true
 [dependencies]
 serde = "1.0.203"
 derive_more = "0.99.18"
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate"] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate"] }
 log = "0.4.22"
 chrono = {version = "0.4.38", features = ["serde"]}

pointercrate-core/Cargo.toml

@@ -16,7 +16,7 @@ pointercrate-core-pages = {path = "../pointercrate-core-pages"}
 pointercrate-user = {path = "../pointercrate-user"}
 pointercrate-user-api = {path = "../pointercrate-user-api"}
 pointercrate-integrate = {path = "../pointercrate-integrate"}
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
 serde_json = "1.0.118"
 log = "0.4.22"
 serde_urlencoded = "0.7.0"

pointercrate-demonlist-api/Cargo.toml

@@ -8,7 +8,7 @@ edition.workspace = true
 
 [dependencies]
 serde = "1.0.203"
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
 derive_more = "0.99.18"
 pointercrate-core = {path = "../pointercrate-core"}
 pointercrate-user = {path = "../pointercrate-user"}

pointercrate-demonlist/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
 bincode = "1.3.1"
 reqwest = "0.12.*"
 futures = "0.3.8"
@@ -20,5 +20,5 @@ governor = "0.6.3"
 nonzero_ext = "0.3.0"
 
 [dependencies.dash-rs]
-git = "https://github.com/qimiko/dash-rs"
-rev = "21b8e86aa3ffe9ba4ba4bfd147b94abf2afa50ef"
+git = "https://github.com/stadust/dash-rs"
+rev = "397c4730d7789668bd6a8ab5a13ec9b826cd3b43"

pointercrate-integrate/Cargo.toml

@@ -5,7 +5,10 @@ use dash_rs::{
         song::{MainSong, NewgroundsSong},
         GameVersion,
     },
-    request::level::{LevelRequest, LevelRequestType, LevelsRequest, SearchFilters},
+    request::{
+        level::{LevelRequest, LevelRequestType, LevelsRequest, SearchFilters},
+        GD_SERVER_ENDPOINT_BASE_URL
+    },
     response::{parse_download_gj_level_response, parse_get_gj_levels_response},
 };
 use log::{error, trace};
@@ -144,6 +147,8 @@ pub struct GeometryDashConnector {
 
 impl GeometryDashConnector {
     pub fn new(pool: Pool<Postgres>) -> Self {
+        GD_SERVER_ENDPOINT_BASE_URL.get_or_init(|| "https://19gdps.com/gdapi/".to_string());
+
         GeometryDashConnector {
             pool,
             http_client: Client::new(),

pointercrate-integrate/src/gd.rs

@@ -15,7 +15,7 @@ pointercrate-user = {path = "../pointercrate-user"}
 pointercrate-user-api = {path = "../pointercrate-user-api"}
 pointercrate-user-pages = {path = "../pointercrate-user-pages"}
 serde = "1.0.203"
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
 rocket = "0.5.1"
 serde_json = "1.0.118"
 dotenv = "0.15.0"

pointercrate-test/Cargo.toml

@@ -8,7 +8,7 @@ edition.workspace = true
 
 [dependencies]
 rocket = {version = "0.5.1", features = ["json"]}
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
 pointercrate-user = {path = "../pointercrate-user"}
 pointercrate-user-pages = {path = "../pointercrate-user-pages"}
 pointercrate-core = {path = "../pointercrate-core"}

pointercrate-user-api/Cargo.toml

@@ -10,7 +10,7 @@ edition.workspace = true
 pointercrate-core = {path = "../pointercrate-core"}
 serde = "1.0.203"
 derive_more = "0.99.18"
-sqlx = { version = "0.7", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
+sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
 jsonwebtoken = "9.3.0"
 log = "0.4.22"
 futures = "0.3.8"