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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"steamapi": "3.1.5",
"steamid": "2.1.0",
"tailwindcss": "4.2.2",
"type-fest": "5.4.4",
"type-fest": "5.5.0",
"umzug": "3.8.2",
"ws": "8.19.0",
"zod": "4.3.6"
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 16 additions & 3 deletions src/games/views/html/game.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,20 @@ import { requestContext } from '@fastify/request-context'

export async function GamePage(props: { number: GameNumber }) {
const user = requestContext.get('user')
const game = await findOne({ number: props.number })
const game = await findOne({ number: props.number }, [
'number',
'map',
'state',
'slots',
'events',
'gameServer',
'logsUrl',
'demoUrl',
'score',
'connectString',
'stvConnectString',
])
const actor = user?.player.steamId
return (
<Layout
title={makeTitle(`game #${game.number}`)}
Expand All @@ -27,8 +40,8 @@ export async function GamePage(props: { number: GameNumber }) {
<NavigationBar />
<Page>
<div class="game-page relative container mx-auto">
<GameSummary game={game} actor={user?.player.steamId} />
<GameSlotList game={game} actor={user?.player.steamId} />
<GameSummary game={game} actor={actor} />
<GameSlotList game={game} actor={actor} />
<GameEventList game={game} />

{user?.player.roles.includes(PlayerRole.admin) && <AdminToolbox game={game} />}
Expand Down
16 changes: 15 additions & 1 deletion src/games/views/json/game-to-dto.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
import { GameEventType } from '../../../database/models/game-event.model'
import type { GameModel } from '../../../database/models/game.model'
import type { PickDeep } from 'type-fest'

export function gameToDto(game: GameModel) {
type Game = PickDeep<
GameModel,
| 'number'
| 'map'
| 'state'
| 'score'
| 'logsUrl'
| 'demoUrl'
| 'events'
| 'gameServer.name'
| 'gameServer.provider'
>

export function gameToDto(game: Game) {
const endedEvent = game.events.find(e => e.event === GameEventType.gameEnded)

return {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/api/v1/games/:id/events/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default routes(async app => {
},
},
async (request, reply) => {
const game = await games.findOne({ number: request.params.id })
const game = await games.findOne({ number: request.params.id }, ['number', 'events'])
const events = game.events.map(gameEventToPublicDto).filter(isNotNil)

return reply
Expand Down
12 changes: 11 additions & 1 deletion src/routes/api/v1/games/:id/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ export default routes(async app => {
},
},
async (request, reply) => {
const game = await games.findOne({ number: request.params.id })
const game = await games.findOne({ number: request.params.id }, [
'number',
'map',
'state',
'score',
'logsUrl',
'demoUrl',
'events',
'gameServer.name',
'gameServer.provider',
])
return reply.type('application/hal+json').status(200).send(gameToDto(game))
},
)
Expand Down
14 changes: 13 additions & 1 deletion src/routes/api/v1/games/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@ export default routes(async app => {
const filter = state ? { state } : {}
const total = await collections.games.countDocuments(filter)
const gamesList = await collections.games
.find(filter)
.find(filter, {
projection: {
number: 1,
map: 1,
state: 1,
score: 1,
logsUrl: 1,
demoUrl: 1,
events: 1,
'gameServer.name': 1,
'gameServer.provider': 1,
},
})
.sort({ number: -1 })
.skip(offset)
.limit(limit)
Expand Down
14 changes: 13 additions & 1 deletion src/routes/api/v1/players/:steamId/games/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,19 @@ export default routes(async app => {
const filter = { 'slots.player': steamId }
const total = await collections.games.countDocuments(filter)
const gamesList = await collections.games
.find(filter)
.find(filter, {
projection: {
number: 1,
map: 1,
state: 1,
score: 1,
logsUrl: 1,
demoUrl: 1,
events: 1,
'gameServer.name': 1,
'gameServer.provider': 1,
},
})
.sort({ number: -1 })
.skip(offset)
.limit(limit)
Expand Down
15 changes: 14 additions & 1 deletion src/routes/games/:number/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,20 @@ export default routes(async app => {
async (request, reply) => {
const { number } = request.params
const { gameServer } = request.body
const game = await games.findOne({ number })
const game = await games.findOne({ number }, [
'number',
'map',
'state',
'slots',
'events',
'gameServer',
'logsUrl',
'demoUrl',
'score',
'logSecret',
'connectString',
'stvConnectString',
])
await gameServers.assign(game, gameServer, request.user!.player.steamId)
await reply
.trigger({ close: { target: '#choose-game-server-dialog' } })
Expand Down
Loading