From 459e36c0273d9ba543310e3e7ff2cc884a48699b Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sun, 27 Feb 2022 21:44:00 -0700
Subject: [PATCH] Run fmt, fix dep route (#312)
---
sqlx-data.json | 58 ++-
src/database/models/categories.rs | 190 ++++++++--
src/database/models/mod.rs | 10 +-
src/database/models/notification_item.rs | 11 +-
src/database/models/project_item.rs | 63 +++-
src/database/models/report_item.rs | 13 +-
src/database/models/team_item.rs | 3 +-
src/database/models/user_item.rs | 23 +-
src/database/models/version_item.rs | 44 ++-
src/database/postgres_database.rs | 3 +-
src/file_hosting/backblaze.rs | 31 +-
src/file_hosting/backblaze/authorization.rs | 8 +-
src/file_hosting/mock.rs | 17 +-
src/file_hosting/s3_host.rs | 38 +-
src/health/status.rs | 4 +-
src/main.rs | 89 +++--
src/models/ids.rs | 9 +-
src/models/projects.rs | 10 +-
src/ratelimit/errors.rs | 16 +-
src/ratelimit/memory.rs | 54 ++-
src/ratelimit/middleware.rs | 70 +++-
src/routes/auth.rs | 39 +-
src/routes/maven.rs | 66 +++-
src/routes/mod.rs | 78 ++--
src/routes/moderation.rs | 15 +-
src/routes/notifications.rs | 55 ++-
src/routes/project_creation.rs | 200 ++++++----
src/routes/projects.rs | 388 +++++++++++++-------
src/routes/reports.rs | 43 ++-
src/routes/tags.rs | 93 +++--
src/routes/teams.rs | 197 ++++++----
src/routes/updates.rs | 17 +-
src/routes/users.rs | 132 ++++---
src/routes/v1/moderation.rs | 15 +-
src/routes/v1/mods.rs | 16 +-
src/routes/v1/reports.rs | 43 ++-
src/routes/v1/tags.rs | 49 ++-
src/routes/v1/teams.rs | 18 +-
src/routes/v1/users.rs | 30 +-
src/routes/version_creation.rs | 140 ++++---
src/routes/version_file.rs | 41 ++-
src/scheduler.rs | 26 +-
src/search/indexing/local_import.rs | 4 +-
src/search/indexing/mod.rs | 49 ++-
src/search/indexing/queue.rs | 10 +-
src/search/mod.rs | 13 +-
src/util/auth.rs | 3 +-
src/util/routes.rs | 12 +-
src/util/validate.rs | 18 +-
src/validate/fabric.rs | 15 +-
src/validate/forge.rs | 22 +-
src/validate/mod.rs | 32 +-
src/validate/pack.rs | 28 +-
53 files changed, 1801 insertions(+), 870 deletions(-)
diff --git a/sqlx-data.json b/sqlx-data.json
index a52de9cb..4eacd559 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -1655,38 +1655,6 @@
"nullable": []
}
},
- "5a03c653f1ff3339a01422ee4267a66157e6da9a51cc7d9beb0f87d59c3a444c": {
- "query": "\n SELECT d.dependent_id, d.dependency_id, d.mod_dependency_id\n FROM versions v\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE v.mod_id = $1\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "dependent_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "dependency_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "mod_dependency_id",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- true,
- true
- ]
- }
- },
"5a13a79ebb1ab975f88b58e6deaba9685fe16e242c0fa4a5eea54f12f9448e6b": {
"query": "\n DELETE FROM reports\n WHERE version_id = $1\n ",
"describe": {
@@ -2424,6 +2392,32 @@
]
}
},
+ "7eab623af88469235cad7cdf0b37bdf51eade3f5e1de25c63a8e08e55722003f": {
+ "query": "\n SELECT d.dependency_id, vd.mod_id\n FROM versions v\n INNER JOIN dependencies d ON d.dependent_id = v.id\n INNER JOIN versions vd ON d.dependency_id = vd.id\n WHERE v.mod_id = $1\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "dependency_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 1,
+ "name": "mod_id",
+ "type_info": "Int8"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int8"
+ ]
+ },
+ "nullable": [
+ true,
+ false
+ ]
+ }
+ },
"8129255d25bf0624d83f50558b668ed7b7f9c264e380d276522fc82bc871939b": {
"query": "\n INSERT INTO notifications_actions (\n notification_id, title, action_route, action_route_method\n )\n VALUES (\n $1, $2, $3, $4\n )\n ",
"describe": {
diff --git a/src/database/models/categories.rs b/src/database/models/categories.rs
index 501fda10..4af54b36 100644
--- a/src/database/models/categories.rs
+++ b/src/database/models/categories.rs
@@ -62,7 +62,10 @@ impl Category {
}
}
- pub async fn get_id<'a, E>(name: &str, exec: E) -> Result