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

Shulkers of fixes (#327)

Browse Source 
* Shulkers of fixes

* Fix validation message

* Update deps

* Bump docker image version
This commit is contained in:
Geometrically
2022-03-27 19:12:42 -07:00
committed by GitHub
parent 7415b07586
commit d1c0c9739d
42 changed files with 683 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ macro_rules! generate_ids {
retry_count += 1;
if retry_count > ID_RETRY_COUNT {
return Err(DatabaseError::RandomIdError);
return Err(DatabaseError::RandomId);
}
}

6
src/database/models/mod.rs
View File

@@ -24,16 +24,16 @@ pub use version_item::VersionFile;
#[derive(Error, Debug)]
pub enum DatabaseError {
#[error("Error while interacting with the database: {0}")]
DatabaseError(#[from] sqlx::error::Error),
Database(#[from] sqlx::error::Error),
#[error("Error while trying to generate random ID")]
RandomIdError,
RandomId,
#[error(
"Invalid identifier: Category/version names must contain only ASCII \
alphanumeric characters or '_-'."
)]
InvalidIdentifier(String),
#[error("Invalid permissions bitflag!")]
BitflagError,
Bitflag,
#[error("A database request failed")]
Other(String),
}

16
src/database/models/team_item.rs
View File

@@ -124,7 +124,7 @@ impl TeamMember {
accepted: m.accepted,
})))
} else {
Ok(Some(Err(super::DatabaseError::BitflagError)))
Ok(Some(Err(super::DatabaseError::Bitflag)))
}
} else {
Ok(None)
@@ -186,7 +186,7 @@ impl TeamMember {
},
})))
} else {
Ok(Some(Err(super::DatabaseError::BitflagError)))
Ok(Some(Err(super::DatabaseError::Bitflag)))
}
} else {
Ok(None)
@@ -234,7 +234,7 @@ impl TeamMember {
accepted: m.accepted,
})))
} else {
Ok(Some(Err(super::DatabaseError::BitflagError)))
Ok(Some(Err(super::DatabaseError::Bitflag)))
}
} else {
Ok(None)
@@ -282,7 +282,7 @@ impl TeamMember {
accepted: m.accepted,
})))
} else {
Ok(Some(Err(super::DatabaseError::BitflagError)))
Ok(Some(Err(super::DatabaseError::Bitflag)))
}
} else {
Ok(None)
@@ -326,7 +326,7 @@ impl TeamMember {
user_id,
role: m.role,
permissions: Permissions::from_bits(m.permissions as u64)
.ok_or(super::DatabaseError::BitflagError)?,
.ok_or(super::DatabaseError::Bitflag)?,
accepted: m.accepted,
}))
} else {
@@ -362,7 +362,7 @@ impl TeamMember {
user_id,
role: m.role,
permissions: Permissions::from_bits(m.permissions as u64)
.ok_or(super::DatabaseError::BitflagError)?,
.ok_or(super::DatabaseError::Bitflag)?,
accepted: m.accepted,
}))
} else {
@@ -510,7 +510,7 @@ impl TeamMember {
user_id,
role: m.role,
permissions: Permissions::from_bits(m.permissions as u64)
.ok_or(super::DatabaseError::BitflagError)?,
.ok_or(super::DatabaseError::Bitflag)?,
accepted: m.accepted,
}))
} else {
@@ -546,7 +546,7 @@ impl TeamMember {
user_id,
role: m.role,
permissions: Permissions::from_bits(m.permissions as u64)
.ok_or(super::DatabaseError::BitflagError)?,
.ok_or(super::DatabaseError::Bitflag)?,
accepted: m.accepted,
}))
} else {

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

@@ -460,7 +460,7 @@ impl Version {
sqlx::query!(
"
DELETE FROM dependencies WHERE dependent_id = $1 AND dependency_id = $1
DELETE FROM dependencies WHERE dependent_id = $1
",
id as VersionId,
)