diff --git a/src/assets/vue3-sfc-loader-options.js b/src/assets/vue3-sfc-loader-options.js index a501bbf..77b9f2c 100644 --- a/src/assets/vue3-sfc-loader-options.js +++ b/src/assets/vue3-sfc-loader-options.js @@ -7,7 +7,7 @@ export const sfcLoaderOptions = { getFile: async (url) => { const res = await fetch(url) - if (!res.ok) throw Object.assign(new Error(res.statusText + ' ' + url), { res }) + if (! res.ok) throw Object.assign(new Error(res.statusText + ' ' + url), { res }) // #65: this enables using query params const pathname = new URL(`${window.location.origin}${url}`).pathname diff --git a/src/server/gsi.js b/src/server/gsi.js index e27e73d..be9597f 100644 --- a/src/server/gsi.js +++ b/src/server/gsi.js @@ -3,7 +3,7 @@ import { additionalState, gsiState } from './state.js' export const registerGsiRoutes = (router, websocket) => { router.post('/gsi', (context) => { const userAgent = context.request.headers['user-agent'] - if (!userAgent.startsWith('Valve/Steam HTTP Client')) return context.status = 400 + if (! userAgent.startsWith('Valve/Steam HTTP Client')) return context.status = 400 const body = context.request.body const authToken = body.auth.token diff --git a/src/themes/fennec/focused-player/name-and-stats/data-row/bomb-or-defuser/bomb-or-defuser.js b/src/themes/fennec/focused-player/name-and-stats/data-row/bomb-or-defuser/bomb-or-defuser.js index c574d1d..6b6811b 100644 --- a/src/themes/fennec/focused-player/name-and-stats/data-row/bomb-or-defuser/bomb-or-defuser.js +++ b/src/themes/fennec/focused-player/name-and-stats/data-row/bomb-or-defuser/bomb-or-defuser.js @@ -5,7 +5,7 @@ export default { }, isBombActive() { - return this.player?.weapons?.find((weapon) => weapon.isActive)?.isBomb + return !! this.player?.bomb?.isActive }, }, } diff --git a/src/themes/fennec/focused-player/name-and-stats/data-row/taser/taser.js b/src/themes/fennec/focused-player/name-and-stats/data-row/taser/taser.js index 5f0ce79..6b536d2 100644 --- a/src/themes/fennec/focused-player/name-and-stats/data-row/taser/taser.js +++ b/src/themes/fennec/focused-player/name-and-stats/data-row/taser/taser.js @@ -5,7 +5,7 @@ export default { }, isActive() { - return this.player?.weapons?.find((weapon) => weapon.isActive)?.isTaser + return !! this.player?.taser?.isActive }, }, } diff --git a/src/themes/fennec/players-alive/players-alive.js b/src/themes/fennec/players-alive/players-alive.js index 99c6141..7b26b88 100644 --- a/src/themes/fennec/players-alive/players-alive.js +++ b/src/themes/fennec/players-alive/players-alive.js @@ -4,7 +4,7 @@ export default { computed: { isActive() { if (this.$opts['preferences.playersAlive.hideDuringFreezetime']) { - return !this.$round.isFreezetime + return ! this.$round.isFreezetime } return true diff --git a/src/themes/fennec/series-graph/series-graph.js b/src/themes/fennec/series-graph/series-graph.js index f1194ab..dc2fef5 100644 --- a/src/themes/fennec/series-graph/series-graph.js +++ b/src/themes/fennec/series-graph/series-graph.js @@ -22,7 +22,7 @@ export default { const scoreB = this.$opts[`series.maps.${mapNumber}.enemyTeamScore`] const isOnlyMatch = mapNumbers.size === 1 - const isFirstMapWithoutScores = !scoreA && !scoreB && (mapNumber === 1 || maps[maps.length - 1]?.scores) + const isFirstMapWithoutScores = ! scoreA && ! scoreB && (mapNumber === 1 || maps[maps.length - 1]?.scores) maps.push({ isOnlyMatch, diff --git a/src/themes/fennec/sidebars/sidebar/player/player.js b/src/themes/fennec/sidebars/sidebar/player/player.js index 81767f4..113e20b 100644 --- a/src/themes/fennec/sidebars/sidebar/player/player.js +++ b/src/themes/fennec/sidebars/sidebar/player/player.js @@ -46,7 +46,7 @@ export default { computed: { isBombActive() { - return this.player?.weapons?.find((weapon) => weapon.isActive)?.isBomb + return !! this.player?.bomb?.isActive }, positionClass() { diff --git a/src/themes/raw/gsi/parse-players.js b/src/themes/raw/gsi/parse-players.js index 4bf9ffe..e9d1066 100644 --- a/src/themes/raw/gsi/parse-players.js +++ b/src/themes/raw/gsi/parse-players.js @@ -80,19 +80,19 @@ export const parsePlayers = () => Object.entries(gsiState.allplayers).map(([stea forward: parsePosition(player.forward), hasArmor: player.state?.armor > 0, hasBadKdRatio: kdRatio <= options['preferences.maximumBadKdRatio'], - hasBomb: !!bomb, - hasDefuser: !!player.state?.defusekit, + hasBomb: !! bomb, + hasDefuser: !! player.state?.defusekit, hasGoodKdRatio: kdRatio >= options['preferences.minimumGoodKdRatio'], hasGrenades: grenades.length > 0, - hasHelmet: !!player.state?.helmet, - hasKnife: !!knife, - hasPrimary: !!primary, - hasSecondary: !!secondary, - hasTaser: !!taser, + hasHelmet: !! player.state?.helmet, + hasKnife: !! knife, + hasPrimary: !! primary, + hasSecondary: !! secondary, + hasTaser: !! taser, health: player.state?.health, isAlive: player.state?.health > 0, - isBurning: !!player.state?.burning, // TODO why is this a number instead of a boolean? - isFlashed: !!player.state?.flashed, // TODO why is this a number instead of a boolean? + isBurning: !! player.state?.burning, // TODO why is this a number instead of a boolean? + isFlashed: !! player.state?.flashed, // TODO why is this a number instead of a boolean? isFocused: gsiState.player?.steamid === steam64Id, kills: player.match_stats?.kills, money: player.state?.money,