Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ If everything is set up correctly, you should see `rocket`'s development server
>> (stats_viewer) GET /demonlist/statsviewer
>> (nation_stats_viewer) GET /demonlist/statsviewer/nations
>> (demon_permalink) GET /demonlist/permalink/<demon_id>
>> (demon_levelid) GET /demonlist/levelid/<level_id>
>> (heatmap_css) GET /demonlist/statsviewer/heatmap.css
>> (FileServer: pointercrate-core-pages/static) GET /static/core/<path..> [10]
>> (FileServer: pointercrate-user-pages/static) GET /static/user/<path..> [10]
Expand Down
1 change: 1 addition & 0 deletions pointercrate-demonlist-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ pub fn setup(rocket: Rocket<Build>) -> Rocket<Build> {
pages::nation_stats_viewer,
pages::demon_page,
pages::demon_permalink,
pages::demon_levelid,
pages::heatmap_css
],
)
Expand Down
9 changes: 9 additions & 0 deletions pointercrate-demonlist-api/src/pages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ pub async fn demon_permalink(demon_id: i32, pool: &State<PointercratePool>) -> R
Ok(Redirect::to(rocket::uri!("/demonlist", demon_page(position))))
}

#[rocket::get("/levelid/<level_id>/")]
pub async fn demon_levelid(level_id: i32, pool: &State<PointercratePool>) -> Result<Redirect> {
let mut connection = pool.connection().await?;

let position = MinimalDemon::by_level_id(level_id, &mut connection).await?.position;

Ok(Redirect::to(rocket::uri!("/demonlist", demon_page(position))))
}

#[localized]
#[rocket::get("/<position>/")]
pub async fn demon_page(position: i16, pool: &State<PointercratePool>, gd: &State<GeometryDashConnector>) -> Result<Page> {
Expand Down
10 changes: 10 additions & 0 deletions pointercrate-demonlist/src/demon/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ impl MinimalDemon {
})
}

pub async fn by_level_id(id: i32, connection: &mut PgConnection) -> Result<MinimalDemon> {
sqlx::query_as!(MinimalDemon, r#"SELECT id, name, position FROM demons WHERE level_id = $1"#, i64::from(id))
.fetch_one(connection)
.await
.map_err(|err| match err {
Error::RowNotFound => DemonlistError::DemonNotFoundLevelID { level_id: id },
_ => err.into(),
})
}

pub async fn by_name(name: &str, connection: &mut PgConnection) -> Result<MinimalDemon> {
let mut stream = sqlx::query!(r#"SELECT id, name, position FROM demons WHERE name = $1"#, name.to_string()).fetch(connection);

Expand Down
6 changes: 6 additions & 0 deletions pointercrate-demonlist/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ pub enum DemonlistError {
demon_id: i32,
},

DemonNotFoundLevelID {
level_id: i32,
},

DemonNotFoundName {
demon_name: String,
},
Expand Down Expand Up @@ -226,6 +230,7 @@ impl PointercrateError for DemonlistError {
PlayerNotFound { .. } => 40401,
PlayerNotFoundName { .. } => 40401,
DemonNotFound { .. } => 40401,
DemonNotFoundLevelID { .. } => 40401,
DemonNotFoundName { .. } => 40401,
DemonNotFoundPosition { .. } => 40401,
RecordNotFound { .. } => 40401,
Expand Down Expand Up @@ -283,6 +288,7 @@ impl Display for DemonlistError {
DemonlistError::PlayerNotFoundName { player_name } =>
trp!("error-demonlist-playernotfoundname", "player-name" = player_name),
DemonlistError::DemonNotFound { demon_id } => trp!("error-demonlist-demonnotfound", "demon-id" = demon_id),
DemonlistError::DemonNotFoundLevelID { level_id } => trp!("error-demonlist-demonnotfoundlevelid", "level-id" = level_id),
DemonlistError::DemonNotFoundName { demon_name } => trp!("error-demonlist-demonnotfoundname", "demon-name" = demon_name),
DemonlistError::DemonNotFoundPosition { demon_position } =>
trp!("error-demonlist-demonnotfoundposition", "demon-position" = demon_position),
Expand Down