Skip to content

Commit

Permalink
Make sure to trim boss names
Browse files Browse the repository at this point in the history
  • Loading branch information
fatfingers23 committed Apr 25, 2024
1 parent be6b524 commit 0b82e23
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 3 additions & 2 deletions trackscape-discord-shared/src/database/pb_activities_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ impl PersonalBestActivitiesDb {
&self,
activity_name: String,
) -> Result<PersonalBestActivitiesModel, mongodb::error::Error> {
let trimmed_activity_name = activity_name.trim();
let collection = self.db.collection::<PersonalBestActivitiesModel>(
PersonalBestActivitiesModel::COLLECTION_NAME,
);

let filter = doc! {
"activity_name": activity_name.clone()
"activity_name": trimmed_activity_name.clone()

Check warning on line 40 in trackscape-discord-shared/src/database/pb_activities_db.rs

View workflow job for this annotation

GitHub Actions / Test Backend

call to `.clone()` on a reference in this situation does nothing

Check warning on line 40 in trackscape-discord-shared/src/database/pb_activities_db.rs

View workflow job for this annotation

GitHub Actions / Check Backend

call to `.clone()` on a reference in this situation does nothing
};
match collection.find_one(filter.clone(), None).await? {
Some(activity) => {
Expand All @@ -45,7 +46,7 @@ impl PersonalBestActivitiesDb {
None => {
let new_activity = PersonalBestActivitiesModel {
id: bson::oid::ObjectId::new(),
activity_name: activity_name.clone(),
activity_name: trimmed_activity_name.to_string(),
created_at: bson::DateTime::now(),
};
collection.insert_one(new_activity.clone(), None).await?;
Expand Down
13 changes: 10 additions & 3 deletions trackscape-discord-shared/src/jobs/runelite_commands/pb_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ pub async fn get_pb(message: String, player: String, guild_id: u64) -> Result<()
println!("Could not find boss name in message: {}", message);
return Err(anyhow!("Could not find boss name in message: {}", message));
}
let trimmed_boss = boss.trim();
//Should match whats in RL with spaces and each capitalized.
println!("Long Boss name is: {}", boss);
println!("Long Boss name is: {}", trimmed_boss);

let runelite_api_url = get_runelite_api_url().await?;
let full_url = format!("{}/chat/pb?name={}&boss={}", runelite_api_url, player, boss);
let full_url = format!(
"{}/chat/pb?name={}&boss={}",
runelite_api_url, player, trimmed_boss
);
let pb_request: reqwest::Response = reqwest::get(full_url).await?;
if pb_request.status() != StatusCode::OK {
println!(
Expand All @@ -35,7 +39,10 @@ pub async fn get_pb(message: String, player: String, guild_id: u64) -> Result<()
println!("PB: {}", pb_time);

let db = get_mongodb().await;
let activity = db.pb_activities.create_or_get_activity(boss).await?;
let activity = db
.pb_activities
.create_or_get_activity(trimmed_boss.to_string())
.await?;
let clan_mate = db
.clan_mates
.find_or_create_clan_mate(guild_id, player)
Expand Down

0 comments on commit 0b82e23

Please sign in to comment.