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

Fixes

Browse Source
This commit is contained in:
Geometrically
2021-01-25 14:42:26 -07:00
parent 269884d9f3
commit 710528c01a
2 changed files with 356 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

716
sqlx-data.json
View File

@@ -471,188 +471,6 @@
"nullable": [] "nullable": []
} }
}, },
"1d1ab2b9b33bc9964c0d341385f411d243867a0489706cfb29c0f8689c092bb9": {
"query": "\n SELECT m.id id, m.title title, m.description description, m.downloads downloads,\n m.icon_url icon_url, m.body body, m.body_url body_url, m.published published,\n m.updated updated, m.status status,\n m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,\n m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,\n ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions,\n ARRAY_AGG( DISTINCT md.joining_platform_id || ', ' || md.url || ', ' || dp.short || ', ' || dp.name) donations\n FROM mods m\n INNER JOIN mods_categories mc ON joining_mod_id = m.id\n INNER JOIN categories c ON mc.joining_category_id = c.id\n INNER JOIN versions v ON v.mod_id = m.id\n LEFT OUTER JOIN mods_donations md ON md.joining_mod_id = m.id\n LEFT OUTER JOIN donation_platforms dp ON md.joining_platform_id = dp.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n WHERE m.id IN (SELECT * FROM UNNEST($1::bigint[]))\n GROUP BY m.id, s.id, cs.id, ss.id, l.id;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "title",
"type_info": "Varchar"
},
{
"ordinal": 2,
"name": "description",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "downloads",
"type_info": "Int4"
},
{
"ordinal": 4,
"name": "icon_url",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "body",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "body_url",
"type_info": "Varchar"
},
{
"ordinal": 7,
"name": "published",
"type_info": "Timestamptz"
},
{
"ordinal": 8,
"name": "updated",
"type_info": "Timestamptz"
},
{
"ordinal": 9,
"name": "status",
"type_info": "Int4"
},
{
"ordinal": 10,
"name": "issues_url",
"type_info": "Varchar"
},
{
"ordinal": 11,
"name": "source_url",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "wiki_url",
"type_info": "Varchar"
},
{
"ordinal": 13,
"name": "discord_url",
"type_info": "Varchar"
},
{
"ordinal": 14,
"name": "license_url",
"type_info": "Varchar"
},
{
"ordinal": 15,
"name": "team_id",
"type_info": "Int8"
},
{
"ordinal": 16,
"name": "client_side",
"type_info": "Int4"
},
{
"ordinal": 17,
"name": "server_side",
"type_info": "Int4"
},
{
"ordinal": 18,
"name": "license",
"type_info": "Int4"
},
{
"ordinal": 19,
"name": "slug",
"type_info": "Varchar"
},
{
"ordinal": 20,
"name": "status_name",
"type_info": "Varchar"
},
{
"ordinal": 21,
"name": "client_side_type",
"type_info": "Varchar"
},
{
"ordinal": 22,
"name": "server_side_type",
"type_info": "Varchar"
},
{
"ordinal": 23,
"name": "short",
"type_info": "Varchar"
},
{
"ordinal": 24,
"name": "license_name",
"type_info": "Varchar"
},
{
"ordinal": 25,
"name": "categories",
"type_info": "VarcharArray"
},
{
"ordinal": 26,
"name": "versions",
"type_info": "Int8Array"
},
{
"ordinal": 27,
"name": "donations",
"type_info": "TextArray"
}
],
"parameters": {
"Left": [
"Int8Array"
]
},
"nullable": [
false,
false,
false,
false,
true,
false,
true,
false,
false,
false,
true,
true,
true,
true,
true,
false,
false,
false,
false,
true,
false,
false,
false,
false,
false,
null,
null,
null
]
}
},
"1db6be78a74ff04c52ee105e0df30acf5bbf18f1de328980bb7f3da7f5f6569e": { "1db6be78a74ff04c52ee105e0df30acf5bbf18f1de328980bb7f3da7f5f6569e": {
"query": "\n SELECT id FROM side_types\n WHERE name = $1\n ", "query": "\n SELECT id FROM side_types\n WHERE name = $1\n ",
"describe": { "describe": {
@@ -3014,6 +2832,182 @@
] ]
} }
}, },
"b34f599d25340f20de2d547bd4fc69846d3321492dd7f13de7ecca6a2a752600": {
"query": "\n SELECT m.id id, m.title title, m.description description, m.downloads downloads,\n m.icon_url icon_url, m.body body, m.body_url body_url, m.published published,\n m.updated updated, m.status status,\n m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,\n m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,\n ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions\n FROM mods m\n INNER JOIN mods_categories mc ON joining_mod_id = m.id\n INNER JOIN categories c ON mc.joining_category_id = c.id\n INNER JOIN versions v ON v.mod_id = m.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n WHERE m.id IN (SELECT * FROM UNNEST($1::bigint[]))\n GROUP BY m.id, s.id, cs.id, ss.id, l.id;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "title",
"type_info": "Varchar"
},
{
"ordinal": 2,
"name": "description",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "downloads",
"type_info": "Int4"
},
{
"ordinal": 4,
"name": "icon_url",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "body",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "body_url",
"type_info": "Varchar"
},
{
"ordinal": 7,
"name": "published",
"type_info": "Timestamptz"
},
{
"ordinal": 8,
"name": "updated",
"type_info": "Timestamptz"
},
{
"ordinal": 9,
"name": "status",
"type_info": "Int4"
},
{
"ordinal": 10,
"name": "issues_url",
"type_info": "Varchar"
},
{
"ordinal": 11,
"name": "source_url",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "wiki_url",
"type_info": "Varchar"
},
{
"ordinal": 13,
"name": "discord_url",
"type_info": "Varchar"
},
{
"ordinal": 14,
"name": "license_url",
"type_info": "Varchar"
},
{
"ordinal": 15,
"name": "team_id",
"type_info": "Int8"
},
{
"ordinal": 16,
"name": "client_side",
"type_info": "Int4"
},
{
"ordinal": 17,
"name": "server_side",
"type_info": "Int4"
},
{
"ordinal": 18,
"name": "license",
"type_info": "Int4"
},
{
"ordinal": 19,
"name": "slug",
"type_info": "Varchar"
},
{
"ordinal": 20,
"name": "status_name",
"type_info": "Varchar"
},
{
"ordinal": 21,
"name": "client_side_type",
"type_info": "Varchar"
},
{
"ordinal": 22,
"name": "server_side_type",
"type_info": "Varchar"
},
{
"ordinal": 23,
"name": "short",
"type_info": "Varchar"
},
{
"ordinal": 24,
"name": "license_name",
"type_info": "Varchar"
},
{
"ordinal": 25,
"name": "categories",
"type_info": "VarcharArray"
},
{
"ordinal": 26,
"name": "versions",
"type_info": "Int8Array"
}
],
"parameters": {
"Left": [
"Int8Array"
]
},
"nullable": [
false,
false,
false,
false,
true,
false,
true,
false,
false,
false,
true,
true,
true,
true,
true,
false,
false,
false,
false,
true,
false,
false,
false,
false,
false,
null,
null
]
}
},
"b69a6f42965b3e7103fcbf46e39528466926789ff31e9ed2591bb175527ec169": { "b69a6f42965b3e7103fcbf46e39528466926789ff31e9ed2591bb175527ec169": {
"query": "\n DELETE FROM users\n WHERE id = $1\n ", "query": "\n DELETE FROM users\n WHERE id = $1\n ",
"describe": { "describe": {
@@ -3684,6 +3678,182 @@
] ]
} }
}, },
"e3d3ec698e523cb7251804d9ef518045ebc5a0a9740c214d2e091ccf7492405d": {
"query": "\n SELECT m.id id, m.title title, m.description description, m.downloads downloads,\n m.icon_url icon_url, m.body body, m.body_url body_url, m.published published,\n m.updated updated, m.status status,\n m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,\n m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,\n ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions\n FROM mods m\n INNER JOIN mods_categories mc ON joining_mod_id = m.id\n INNER JOIN categories c ON mc.joining_category_id = c.id\n INNER JOIN versions v ON v.mod_id = m.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n WHERE m.id = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "title",
"type_info": "Varchar"
},
{
"ordinal": 2,
"name": "description",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "downloads",
"type_info": "Int4"
},
{
"ordinal": 4,
"name": "icon_url",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "body",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "body_url",
"type_info": "Varchar"
},
{
"ordinal": 7,
"name": "published",
"type_info": "Timestamptz"
},
{
"ordinal": 8,
"name": "updated",
"type_info": "Timestamptz"
},
{
"ordinal": 9,
"name": "status",
"type_info": "Int4"
},
{
"ordinal": 10,
"name": "issues_url",
"type_info": "Varchar"
},
{
"ordinal": 11,
"name": "source_url",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "wiki_url",
"type_info": "Varchar"
},
{
"ordinal": 13,
"name": "discord_url",
"type_info": "Varchar"
},
{
"ordinal": 14,
"name": "license_url",
"type_info": "Varchar"
},
{
"ordinal": 15,
"name": "team_id",
"type_info": "Int8"
},
{
"ordinal": 16,
"name": "client_side",
"type_info": "Int4"
},
{
"ordinal": 17,
"name": "server_side",
"type_info": "Int4"
},
{
"ordinal": 18,
"name": "license",
"type_info": "Int4"
},
{
"ordinal": 19,
"name": "slug",
"type_info": "Varchar"
},
{
"ordinal": 20,
"name": "status_name",
"type_info": "Varchar"
},
{
"ordinal": 21,
"name": "client_side_type",
"type_info": "Varchar"
},
{
"ordinal": 22,
"name": "server_side_type",
"type_info": "Varchar"
},
{
"ordinal": 23,
"name": "short",
"type_info": "Varchar"
},
{
"ordinal": 24,
"name": "license_name",
"type_info": "Varchar"
},
{
"ordinal": 25,
"name": "categories",
"type_info": "VarcharArray"
},
{
"ordinal": 26,
"name": "versions",
"type_info": "Int8Array"
}
],
"parameters": {
"Left": [
"Int8"
]
},
"nullable": [
false,
false,
false,
false,
true,
false,
true,
false,
false,
false,
true,
true,
true,
true,
true,
false,
false,
false,
false,
true,
false,
false,
false,
false,
false,
null,
null
]
}
},
"e48c85a2b2e11691afae3799aa126bdd8b7338a973308bbab2760c18bb9cb0b7": { "e48c85a2b2e11691afae3799aa126bdd8b7338a973308bbab2760c18bb9cb0b7": {
"query": "\n UPDATE versions\n SET featured = $1\n WHERE (id = $2)\n ", "query": "\n UPDATE versions\n SET featured = $1\n WHERE (id = $2)\n ",
"describe": { "describe": {
@@ -3977,188 +4147,6 @@
"nullable": [] "nullable": []
} }
}, },
"f4e16c3b62a9bc1a41ee4236e3e134ebc942d92199e8a4bb8d4b8692043de399": {
"query": "\n SELECT m.id id, m.title title, m.description description, m.downloads downloads,\n m.icon_url icon_url, m.body body, m.body_url body_url, m.published published,\n m.updated updated, m.status status,\n m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,\n m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,\n s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,\n ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions, ARRAY_AGG(DISTINCT md.joining_platform_id || ', ' || md.url || ', ' || dp.short || ', ' || dp.name) donations\n FROM mods m\n INNER JOIN mods_categories mc ON joining_mod_id = m.id\n INNER JOIN categories c ON mc.joining_category_id = c.id\n INNER JOIN versions v ON v.mod_id = m.id\n INNER JOIN mods_donations md ON md.joining_mod_id = m.id\n INNER JOIN donation_platforms dp ON md.joining_platform_id = dp.id\n INNER JOIN statuses s ON s.id = m.status\n INNER JOIN side_types cs ON m.client_side = cs.id\n INNER JOIN side_types ss ON m.server_side = ss.id\n INNER JOIN licenses l ON m.license = l.id\n WHERE m.id = $1\n GROUP BY m.id, s.id, cs.id, ss.id, l.id;\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "title",
"type_info": "Varchar"
},
{
"ordinal": 2,
"name": "description",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "downloads",
"type_info": "Int4"
},
{
"ordinal": 4,
"name": "icon_url",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "body",
"type_info": "Varchar"
},
{
"ordinal": 6,
"name": "body_url",
"type_info": "Varchar"
},
{
"ordinal": 7,
"name": "published",
"type_info": "Timestamptz"
},
{
"ordinal": 8,
"name": "updated",
"type_info": "Timestamptz"
},
{
"ordinal": 9,
"name": "status",
"type_info": "Int4"
},
{
"ordinal": 10,
"name": "issues_url",
"type_info": "Varchar"
},
{
"ordinal": 11,
"name": "source_url",
"type_info": "Varchar"
},
{
"ordinal": 12,
"name": "wiki_url",
"type_info": "Varchar"
},
{
"ordinal": 13,
"name": "discord_url",
"type_info": "Varchar"
},
{
"ordinal": 14,
"name": "license_url",
"type_info": "Varchar"
},
{
"ordinal": 15,
"name": "team_id",
"type_info": "Int8"
},
{
"ordinal": 16,
"name": "client_side",
"type_info": "Int4"
},
{
"ordinal": 17,
"name": "server_side",
"type_info": "Int4"
},
{
"ordinal": 18,
"name": "license",
"type_info": "Int4"
},
{
"ordinal": 19,
"name": "slug",
"type_info": "Varchar"
},
{
"ordinal": 20,
"name": "status_name",
"type_info": "Varchar"
},
{
"ordinal": 21,
"name": "client_side_type",
"type_info": "Varchar"
},
{
"ordinal": 22,
"name": "server_side_type",
"type_info": "Varchar"
},
{
"ordinal": 23,
"name": "short",
"type_info": "Varchar"
},
{
"ordinal": 24,
"name": "license_name",
"type_info": "Varchar"
},
{
"ordinal": 25,
"name": "categories",
"type_info": "VarcharArray"
},
{
"ordinal": 26,
"name": "versions",
"type_info": "Int8Array"
},
{
"ordinal": 27,
"name": "donations",
"type_info": "TextArray"
}
],
"parameters": {
"Left": [
"Int8"
]
},
"nullable": [
false,
false,
false,
false,
true,
false,
true,
false,
false,
false,
true,
true,
true,
true,
true,
false,
false,
false,
false,
true,
false,
false,
false,
false,
false,
null,
null,
null
]
}
},
"f7bea04e8e279e27a24de1bdf3c413daa8677994df5131494b28691ed6611efc": { "f7bea04e8e279e27a24de1bdf3c413daa8677994df5131494b28691ed6611efc": {
"query": "\n SELECT url,expires FROM states\n WHERE id = $1\n ", "query": "\n SELECT url,expires FROM states\n WHERE id = $1\n ",
"describe": { "describe": {

39
src/database/models/mod_item.rs
View File

@@ -409,13 +409,11 @@ impl Mod {
m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url, m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,
m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug, m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,
s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name, s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,
ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions, ARRAY_AGG(DISTINCT md.joining_platform_id || ', ' || md.url || ', ' || dp.short || ', ' || dp.name) donations ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions
FROM mods m FROM mods m
INNER JOIN mods_categories mc ON joining_mod_id = m.id INNER JOIN mods_categories mc ON joining_mod_id = m.id
INNER JOIN categories c ON mc.joining_category_id = c.id INNER JOIN categories c ON mc.joining_category_id = c.id
INNER JOIN versions v ON v.mod_id = m.id INNER JOIN versions v ON v.mod_id = m.id
INNER JOIN mods_donations md ON md.joining_mod_id = m.id
INNER JOIN donation_platforms dp ON md.joining_platform_id = dp.id
INNER JOIN statuses s ON s.id = m.status INNER JOIN statuses s ON s.id = m.status
INNER JOIN side_types cs ON m.client_side = cs.id INNER JOIN side_types cs ON m.client_side = cs.id
INNER JOIN side_types ss ON m.server_side = ss.id INNER JOIN side_types ss ON m.server_side = ss.id
@@ -460,23 +458,7 @@ impl Mod {
.into_iter() .into_iter()
.map(|v| VersionId(v)) .map(|v| VersionId(v))
.collect(), .collect(),
donation_urls: m donation_urls: vec![],
.donations
.clone()
.unwrap_or(vec![])
.into_iter()
.map(|d| {
// TODO: Change this once SQLX allows postgres tuples
let strings: Vec<&str> = d.split(", ").collect();
DonationUrl {
mod_id: ModId(m.id.clone()),
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string(),
}
})
.collect(),
status: crate::models::mods::ModStatus::from_str(&m.status_name), status: crate::models::mods::ModStatus::from_str(&m.status_name),
license_id: m.short, license_id: m.short,
license_name: m.license_name, license_name: m.license_name,
@@ -506,14 +488,11 @@ impl Mod {
m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url, m.issues_url issues_url, m.source_url source_url, m.wiki_url wiki_url, m.discord_url discord_url, m.license_url license_url,
m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug, m.team_id team_id, m.client_side client_side, m.server_side server_side, m.license license, m.slug slug,
s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name, s.status status_name, cs.name client_side_type, ss.name server_side_type, l.short short, l.name license_name,
ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions, ARRAY_AGG( DISTINCT c.category) categories, ARRAY_AGG(DISTINCT v.id) versions
ARRAY_AGG( DISTINCT md.joining_platform_id || ', ' || md.url || ', ' || dp.short || ', ' || dp.name) donations
FROM mods m FROM mods m
INNER JOIN mods_categories mc ON joining_mod_id = m.id INNER JOIN mods_categories mc ON joining_mod_id = m.id
INNER JOIN categories c ON mc.joining_category_id = c.id INNER JOIN categories c ON mc.joining_category_id = c.id
INNER JOIN versions v ON v.mod_id = m.id INNER JOIN versions v ON v.mod_id = m.id
LEFT OUTER JOIN mods_donations md ON md.joining_mod_id = m.id
LEFT OUTER JOIN donation_platforms dp ON md.joining_platform_id = dp.id
INNER JOIN statuses s ON s.id = m.status INNER JOIN statuses s ON s.id = m.status
INNER JOIN side_types cs ON m.client_side = cs.id INNER JOIN side_types cs ON m.client_side = cs.id
INNER JOIN side_types ss ON m.server_side = ss.id INNER JOIN side_types ss ON m.server_side = ss.id
@@ -550,17 +529,7 @@ impl Mod {
}, },
categories: m.categories.clone().unwrap_or(vec![]), categories: m.categories.clone().unwrap_or(vec![]),
versions: m.versions.clone().unwrap_or(vec![]).into_iter().map(|v| VersionId(v)).collect(), versions: m.versions.clone().unwrap_or(vec![]).into_iter().map(|v| VersionId(v)).collect(),
donation_urls: m.donations.clone().unwrap_or(vec![]).into_iter().map(|d| { donation_urls: vec![],
// TODO: Change this once SQLX allows postgres tuples
let strings : Vec<&str> = d.split(", ").collect();
DonationUrl {
mod_id: ModId(m.id.clone()),
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string()
}
}).collect(),
status: crate::models::mods::ModStatus::from_str(&m.status_name), status: crate::models::mods::ModStatus::from_str(&m.status_name),
license_id: m.short, license_id: m.short,
license_name: m.license_name, license_name: m.license_name,