Skip to content
Merged
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 src/database/models/player.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export interface PlayerBan {
start: Date
end: Date
reason: string
anonymous?: boolean
}

export interface TwitchTvProfile {
Expand Down
2 changes: 2 additions & 0 deletions src/players/add-ban.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ export async function addBan(props: {
admin: SteamId64 | Bot
end: Date
reason: string
anonymous?: boolean
}): Promise<PlayerBan> {
const actor = isBot(props.admin) ? 'bot' : (await bySteamId(props.admin, ['steamId'])).steamId
const ban: PlayerBan = {
actor,
start: new Date(),
end: props.end,
reason: props.reason,
...(props.anonymous ? { anonymous: true } : {}),
}

await update(props.player, { $push: { bans: ban } })
Expand Down
11 changes: 11 additions & 0 deletions src/players/views/html/add-ban.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import { makeTitle } from '../../../html/make-title'
import type { SteamId64 } from '../../../shared/types/steam-id-64'
import { players } from '../..'
import { getBanExpiryDate } from '../../get-ban-expiry-date'
import { environment } from '../../../environment'

export async function AddBanPage(props: { steamId: SteamId64 }) {
const player = await players.bySteamId(props.steamId, ['name'])
const safeWebsiteName = environment.WEBSITE_NAME
return (
<Layout
title={makeTitle(`Ban ${player.name}`)}
Expand Down Expand Up @@ -119,6 +121,15 @@ export async function AddBanPage(props: { steamId: SteamId64 }) {
</label>
<input type="text" name="reason" id="banReason" required />
</div>

<div class="form-checkbox">
<input type="checkbox" name="anonymous" id="banAnonymous" />
<label for="banAnonymous">Anonymous</label>
<p class="description">
The banned player will see this ban as issued by {safeWebsiteName} Staff. Admins
will still see who issued it.
</p>
</div>
</div>

<button type="submit" class="button mt-6" data-variant="accent">
Expand Down
5 changes: 4 additions & 1 deletion src/players/views/html/edit-player.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ export async function BanDetails(props: {
<span class="me-2 text-2xl font-bold" safe>
{props.ban.reason}
</span>
<span class="text-sm">by {actorDesc}</span>
<span class="text-sm">
by {actorDesc}
{props.ban.anonymous && <span class="italic"> (anonymous)</span>}
</span>
</div>

<div class="row-span-2 flex items-center">
Expand Down
26 changes: 25 additions & 1 deletion src/queue-auto/views/html/ban-alerts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { collections } from '../../../database/collections'
import type { PlayerModel } from '../../../database/models/player.model'
import type { PlayerBan, PlayerModel } from '../../../database/models/player.model'
import { environment } from '../../../environment'
import { players } from '../../../players'
import { isBot } from '../../../shared/types/bot'
import type { SteamId64 } from '../../../shared/types/steam-id-64'

export async function BanAlerts(props: { actor?: SteamId64 | undefined }) {
Expand Down Expand Up @@ -42,8 +45,29 @@ export async function BanAlertList(props: { actor?: SteamId64 | undefined }) {
<span class="font-bold" safe>
{ban.reason}
</span>
<BanAttribution ban={ban} />
</div>
))}
</>
)
}

async function BanAttribution(props: { ban: PlayerBan }) {
let actorName: string
if (props.ban.anonymous) {
actorName = `${environment.WEBSITE_NAME} Staff`
} else if (isBot(props.ban.actor)) {
return <></>
} else {
actorName = (await players.bySteamId(props.ban.actor, ['name'])).name
}

return (
<>
&nbsp;by&nbsp;
<span class="font-bold" safe>
{actorName}
</span>
</>
)
}
4 changes: 4 additions & 0 deletions src/routes/players/:steamId/edit/bans/add/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ export default routes(async app => {
banExpiryFormSchema,
z.object({
reason: z.string(),
// When the checkbox is unchecked, browsers omit it from the request body entirely.
// The default(false) here handles that case.
anonymous: z.coerce.boolean().default(false),
}),
),
},
Expand All @@ -50,6 +53,7 @@ export default routes(async app => {
admin: request.user!.player.steamId,
end: players.getBanExpiryDate(request.body),
reason: request.body.reason,
anonymous: request.body.anonymous,
})
request.flash('success', `Player ban added`)
reply.redirect(`/players/${request.params.steamId}/edit/bans`)
Expand Down
26 changes: 24 additions & 2 deletions tests/30-bans/02-ban-alert.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,34 @@ authUsers('banned player sees ban alert @6v6 @9v9', async ({ users }) => {
const playerPage = await player.queuePage()
await playerPage.goto()

const adminPage = await users.getAdmin().adminPage()
const admin = users.getAdmin()
const adminPage = await admin.adminPage()
await adminPage.banPlayer(player.steamId, { reason: 'testing' })

const banAlert = playerPage.page.getByText('You are banned')
await expect(banAlert).toBeVisible()
await expect(banAlert).toHaveText(/^You are banned until\s*.+\s*for\s*testing\s*$/)
await expect(banAlert).toHaveText(
new RegExp(`^You are banned until\\s*.+\\s*for\\s*testing\\s*by\\s*${admin.playerName}\\s*$`),
)

await adminPage.revokeAllBans(player.steamId)
await expect(banAlert).not.toBeVisible()
})

authUsers('anonymously banned player does not see the admin @6v6 @9v9', async ({ users }) => {
const player = users.byName('AstraGirl')
const playerPage = await player.queuePage()
await playerPage.goto()

const admin = users.getAdmin()
const adminPage = await admin.adminPage()
await adminPage.banPlayer(player.steamId, { reason: 'testing', anonymous: true })

const banAlert = playerPage.page.getByText('You are banned')
await expect(banAlert).toBeVisible()
await expect(banAlert).toHaveText(
/^You are banned until\s*.+\s*for\s*testing\s*by\s*tf2pickup\.org Staff\s*$/,
)

await adminPage.revokeAllBans(player.steamId)
await expect(banAlert).not.toBeVisible()
Expand Down
5 changes: 4 additions & 1 deletion tests/pages/admin.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ export class AdminPage {
}
}

async banPlayer(steamId: string, { reason }: { reason: string }) {
async banPlayer(steamId: string, { reason, anonymous }: { reason: string; anonymous?: boolean }) {
await this.page.goto(`/players/${steamId}`)
await this.openToolbox()
await this.page.getByRole('link', { name: 'Edit player' }).click()
await this.page.getByRole('link', { name: 'Bans' }).click()
await this.page.getByRole('link', { name: 'Add ban' }).click()
await this.page.getByLabel('Reason').fill(reason)
if (anonymous) {
await this.page.getByLabel('Anonymous').check()
}
await this.page.getByRole('button', { name: 'Save' }).click()
}

Expand Down
Loading