Skip to content

Commit 860593c

Browse files
committed
Stops made up !Pb commands
1 parent 023861a commit 860593c

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ services:
4141
DISCORD_TOKEN: '${DISCORD_TOKEN}'
4242
TRACKSCAPE_API_BASE: '${TRACKSCAPE_API_BASE}'
4343
REDIS_ADDR: '${REDIS_ADDR}'
44+
WOM_API_KEY: '${WOM_API_KEY}'
4445
depends_on:
4546
- mongo
4647
- redis
@@ -86,4 +87,3 @@ volumes:
8687
networks:
8788
trackscape-network:
8889
driver: bridge
89-

trackscape-discord-shared/src/jobs/runelite_commands/pb_command.rs

+15-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::{database::clan_mates::ClanMates, jobs::job_helpers::get_mongodb};
33
use super::get_runelite_api_url;
44
use anyhow::{anyhow, Ok};
55
use capitalize::Capitalize;
6+
use reqwest::StatusCode;
67
use tokio::time::sleep;
78

89
pub async fn get_pb(message: String, player: String, guild_id: u64) -> Result<(), anyhow::Error> {
@@ -17,8 +18,19 @@ pub async fn get_pb(message: String, player: String, guild_id: u64) -> Result<()
1718

1819
let runelite_api_url = get_runelite_api_url().await?;
1920
let full_url = format!("{}/chat/pb?name={}&boss={}", runelite_api_url, player, boss);
20-
let pb = reqwest::get(full_url).await?.text().await?;
21-
println!("PB: {}", pb);
21+
let pb_request: reqwest::Response = reqwest::get(full_url).await?;
22+
if pb_request.status() != StatusCode::OK {
23+
println!(
24+
"Failed to get pb from runelite api: {}",
25+
pb_request.status()
26+
);
27+
return Err(anyhow!(
28+
"Failed to get pb from runelite api: {}",
29+
pb_request.status()
30+
));
31+
}
32+
let pb_time = pb_request.text().await?.parse::<f64>()?;
33+
println!("PB: {}", pb_time);
2234

2335
let db = get_mongodb().await;
2436
let activity = db.pb_activities.create_or_get_activity(boss).await?;
@@ -28,12 +40,7 @@ pub async fn get_pb(message: String, player: String, guild_id: u64) -> Result<()
2840
.await;
2941
let _ = db
3042
.pb_records
31-
.create_or_update_pb_record(
32-
clan_mate.unwrap().id,
33-
activity.id,
34-
guild_id,
35-
pb.parse::<f64>()?,
36-
)
43+
.create_or_update_pb_record(clan_mate.unwrap().id, activity.id, guild_id, pb_time)
3744
.await?;
3845

3946
Ok(())

trackscape-discord-ui/src/components/General/DataTable.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
});
3535
3636
let searchedTerm = ref<string>("");
37+
let leaderBoardTitle = ref<string>(props.title);
3738
3839
3940
let filteredData = computed(() => {
@@ -72,7 +73,7 @@
7273
<div class="flex justify-between items-center pb-2">
7374
<div class="flex flex-col md:w-1/2 w-full pb-2">
7475
<h3 v-if="props.title !== ''"
75-
class="text-lg font-medium text-neutral-content pb-1">{{props.title}}</h3>
76+
class="text-lg font-medium text-neutral-content pb-1">{{leaderBoardTitle}}</h3>
7677
<p v-if="props.description !== ''"
7778
class="text-sm">{{props.description}}</p>
7879
<input

trackscape-discord-ui/src/stores/PbStore.ts

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ export const usePbStore = defineStore('pb', {
3737
getSelectedActivity: (state) =>{
3838
return state.selectedActivity;
3939
},
40+
getSelectedActivityName: (state) =>{
41+
return state.selectedActivityName;
42+
},
4043
getRecords: (state) =>{
4144
return state.records;
4245
}

trackscape-discord-ui/src/views/clans/clan/subviews/leaderboards/PersonalBestLeaderboardView.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const osrsTimeDisplay = (timeInSeconds: number) => {
6262

6363
<DataTable
6464
v-else
65-
:title="`${store.$state.selectedActivityName} Leaderboard`"
65+
6666
:columns="columns"
6767
:data="store.getRecords"
6868
search-field="clan_mate.player_name"

0 commit comments

Comments
 (0)