From da00b418d0d3bcc90c2495a516816dc56b7d719e Mon Sep 17 00:00:00 2001 From: Victor Klomp Date: Wed, 18 Dec 2024 20:26:34 +0100 Subject: [PATCH] style(poster): prettier --fix --- .../poster/base-poster-screen-controller.ts | 6 +- .../gewis/gewis-poster-screen-controller.ts | 178 +++++++++--------- .../gewis/gewis-poster-screen-handler.ts | 75 ++++---- .../hubble/hubble-poster-screen-controller.ts | 56 +++--- .../hubble/hubble-poster-screen-handler.ts | 14 +- .../poster/trello/trello-poster-manager.ts | 8 +- 6 files changed, 174 insertions(+), 163 deletions(-) diff --git a/src/modules/handlers/screen/poster/base-poster-screen-controller.ts b/src/modules/handlers/screen/poster/base-poster-screen-controller.ts index a23e9d5..4d289f3 100644 --- a/src/modules/handlers/screen/poster/base-poster-screen-controller.ts +++ b/src/modules/handlers/screen/poster/base-poster-screen-controller.ts @@ -4,8 +4,8 @@ import { Request as ExpressRequest } from 'express'; import BasePosterScreenHandler from './base-poster-screen-handler'; import { Poster } from './poster'; import logger from '../../../../logger'; -import OlympicsService from "./olympics-service"; -import NsTrainsService, {TrainResponse} from "./ns-trains-service"; +import OlympicsService from './olympics-service'; +import NsTrainsService, { TrainResponse } from './ns-trains-service'; export interface BorrelModeParams { enabled: boolean; @@ -32,7 +32,7 @@ export class BasePosterScreenController extends Controller { } const posters = this.screenHandler.posterManager.posters ?? []; return { - posters: posters.filter((p) => !p.borrelMode) + posters: posters.filter((p) => !p.borrelMode), }; } diff --git a/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-controller.ts b/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-controller.ts index 73ed068..0d76bee 100644 --- a/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-controller.ts +++ b/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-controller.ts @@ -1,103 +1,111 @@ -import {BasePosterResponse, BasePosterScreenController, BorrelModeParams} from "../base-poster-screen-controller"; -import HandlerManager from "../../../../root/handler-manager"; -import {Screen} from "../../../../root/entities"; -import {GewisPosterScreenHandler} from "../../index"; -import {Body, Get, Post, Put, Query, Request, Route, Security, Tags} from "tsoa"; -import {SecurityNames} from "../../../../../helpers/security"; -import {securityGroups} from "../../../../../helpers/security-groups"; -import logger from "../../../../../logger"; -import {Request as ExpressRequest} from "express"; -import {TrainResponse} from "../ns-trains-service"; -import GEWISPosterService, {GEWISPhotoAlbumParams} from "./gewis-poster-service"; -import OlympicsService from "../olympics-service"; -import {FeatureEnabled} from "../../../../server-settings"; +import { + BasePosterResponse, + BasePosterScreenController, + BorrelModeParams, +} from '../base-poster-screen-controller'; +import HandlerManager from '../../../../root/handler-manager'; +import { Screen } from '../../../../root/entities'; +import { GewisPosterScreenHandler } from '../../index'; +import { Body, Get, Post, Put, Query, Request, Route, Security, Tags } from 'tsoa'; +import { SecurityNames } from '../../../../../helpers/security'; +import { securityGroups } from '../../../../../helpers/security-groups'; +import logger from '../../../../../logger'; +import { Request as ExpressRequest } from 'express'; +import { TrainResponse } from '../ns-trains-service'; +import GEWISPosterService, { GEWISPhotoAlbumParams } from './gewis-poster-service'; +import OlympicsService from '../olympics-service'; +import { FeatureEnabled } from '../../../../server-settings'; interface GewisPosterResponse extends BasePosterResponse { - borrelMode: boolean; + borrelMode: boolean; } @Route('handler/screen/gewis-poster') @Tags('Handlers') @FeatureEnabled('GewisPosterScreenHandler') export class GewisPosterScreenController extends BasePosterScreenController { - protected screenHandler: GewisPosterScreenHandler; + protected screenHandler: GewisPosterScreenHandler; - constructor() { - super(); - this.screenHandler = HandlerManager.getInstance() - .getHandlers(Screen) - .filter((h) => h.constructor.name === GewisPosterScreenHandler.name)[0] as GewisPosterScreenHandler; - } + constructor() { + super(); + this.screenHandler = HandlerManager.getInstance() + .getHandlers(Screen) + .filter( + (h) => h.constructor.name === GewisPosterScreenHandler.name, + )[0] as GewisPosterScreenHandler; + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('') - public async getGewisPosters(@Query() alwaysReturnBorrelPosters?: boolean): Promise { - if (!this.screenHandler.posterManager.posters) { - try { - await this.screenHandler.posterManager.fetchPosters(); - } catch (e) { - logger.error(e); - } - } - const posters = this.screenHandler.posterManager.posters ?? []; - if (alwaysReturnBorrelPosters || this.screenHandler.borrelMode) { - return { - posters, - borrelMode: this.screenHandler.borrelMode, - }; - } - return { - posters: posters.filter((p) => !p.borrelMode), - borrelMode: false, - }; + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('') + public async getGewisPosters( + @Query() alwaysReturnBorrelPosters?: boolean, + ): Promise { + if (!this.screenHandler.posterManager.posters) { + try { + await this.screenHandler.posterManager.fetchPosters(); + } catch (e) { + logger.error(e); + } } - - @Security(SecurityNames.LOCAL, securityGroups.poster.privileged) - @Post('force-update') - public async forceUpdateGewisPosters(@Request() req: ExpressRequest): Promise { - super.forceUpdatePosters(req); + const posters = this.screenHandler.posterManager.posters ?? []; + if (alwaysReturnBorrelPosters || this.screenHandler.borrelMode) { + return { + posters, + borrelMode: this.screenHandler.borrelMode, + }; } + return { + posters: posters.filter((p) => !p.borrelMode), + borrelMode: false, + }; + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('borrel-mode') - public async getPosterBorrelMode(): Promise { - return { enabled: this.screenHandler.borrelMode }; - } + @Security(SecurityNames.LOCAL, securityGroups.poster.privileged) + @Post('force-update') + public async forceUpdateGewisPosters(@Request() req: ExpressRequest): Promise { + super.forceUpdatePosters(req); + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Put('borrel-mode') - public async setPosterBorrelMode( - @Request() req: ExpressRequest, - @Body() body: BorrelModeParams, - ): Promise { - logger.audit( - req.user, - `Set poster screen borrel mode to "${body.enabled ? 'true' : 'false'}".`, - ); - this.screenHandler.setBorrelModeEnabled(body.enabled); - } + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('borrel-mode') + public async getPosterBorrelMode(): Promise { + return { enabled: this.screenHandler.borrelMode }; + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('train-departures') - public async getTrains(): Promise { - return super.getTrains(); - } + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Put('borrel-mode') + public async setPosterBorrelMode( + @Request() req: ExpressRequest, + @Body() body: BorrelModeParams, + ): Promise { + logger.audit( + req.user, + `Set poster screen borrel mode to "${body.enabled ? 'true' : 'false'}".`, + ); + this.screenHandler.setBorrelModeEnabled(body.enabled); + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Post('photo') - public async getPhoto(@Body() params: GEWISPhotoAlbumParams) { - return new GEWISPosterService().getPhoto(params); - } + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('train-departures') + public async getTrains(): Promise { + return super.getTrains(); + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('olympics/medal-table') - public async getOlympicsMedalTable() { - return super.getOlympicsMedalTable(); - } + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Post('photo') + public async getPhoto(@Body() params: GEWISPhotoAlbumParams) { + return new GEWISPosterService().getPhoto(params); + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('olympics/country-medals') - public async getDutchOlympicMedals() { - return new OlympicsService().getDutchMedals(); - } -} \ No newline at end of file + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('olympics/medal-table') + public async getOlympicsMedalTable() { + return super.getOlympicsMedalTable(); + } + + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('olympics/country-medals') + public async getDutchOlympicMedals() { + return new OlympicsService().getDutchMedals(); + } +} diff --git a/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-handler.ts b/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-handler.ts index e972ab0..8cf569b 100644 --- a/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-handler.ts +++ b/src/modules/handlers/screen/poster/gewis/gewis-poster-screen-handler.ts @@ -1,50 +1,49 @@ -import BasePosterScreenHandler from "../base-poster-screen-handler"; -import { Namespace } from "socket.io"; -import { FeatureEnabled } from "../../../../server-settings"; +import BasePosterScreenHandler from '../base-poster-screen-handler'; +import { Namespace } from 'socket.io'; +import { FeatureEnabled } from '../../../../server-settings'; @FeatureEnabled('GewisPosterScreenHandler') export default class GewisPosterScreenHandler extends BasePosterScreenHandler { - private borrelModeDay: number | undefined; + private borrelModeDay: number | undefined; - public borrelModeInterval: NodeJS.Timeout; + public borrelModeInterval: NodeJS.Timeout; - constructor(socket: Namespace) { - super(socket); + constructor(socket: Namespace) { + super(socket); - // Check whether we need to enable/disable borrel mode - this.borrelModeInterval = setInterval(this.checkBorrelMode.bind(this), 60 * 1000); - } + // Check whether we need to enable/disable borrel mode + this.borrelModeInterval = setInterval(this.checkBorrelMode.bind(this), 60 * 1000); + } + public get borrelMode() { + return this.borrelModeDay !== undefined; + } - public get borrelMode() { - return this.borrelModeDay !== undefined; - } + private checkBorrelMode() { + const now = new Date(); - private checkBorrelMode() { - const now = new Date(); - - // If borrelmode is enabled, but we arrive at the next day, disable borrelmode again - if (this.borrelMode && this.borrelModeDay !== now.getDay()) { - this.borrelModeDay = undefined; - return; - } - // if borrelmode is enabled, we do not have to check whether we can enable it - if (this.borrelMode) return; - - // By default, enable borrelmode on Thursdays 16:30 local time - if ( - now.getDay() === 4 && - ((now.getHours() === 16 && now.getMinutes() >= 30) || now.getHours() >= 17) - ) { - this.borrelModeDay = now.getDay(); - } + // If borrelmode is enabled, but we arrive at the next day, disable borrelmode again + if (this.borrelMode && this.borrelModeDay !== now.getDay()) { + this.borrelModeDay = undefined; + return; + } + // if borrelmode is enabled, we do not have to check whether we can enable it + if (this.borrelMode) return; + + // By default, enable borrelmode on Thursdays 16:30 local time + if ( + now.getDay() === 4 && + ((now.getHours() === 16 && now.getMinutes() >= 30) || now.getHours() >= 17) + ) { + this.borrelModeDay = now.getDay(); } + } - public setBorrelModeEnabled(enabled: boolean) { - if (enabled) { - this.borrelModeDay = new Date().getDay(); - } else { - this.borrelModeDay = undefined; - } + public setBorrelModeEnabled(enabled: boolean) { + if (enabled) { + this.borrelModeDay = new Date().getDay(); + } else { + this.borrelModeDay = undefined; } -} \ No newline at end of file + } +} diff --git a/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-controller.ts b/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-controller.ts index fdb91bb..e3bc72d 100644 --- a/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-controller.ts +++ b/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-controller.ts @@ -1,34 +1,36 @@ -import {BasePosterResponse, BasePosterScreenController} from "../base-poster-screen-controller"; -import HandlerManager from "../../../../root/handler-manager"; -import {Screen} from "../../../../root/entities"; -import BasePosterScreenHandler from "../base-poster-screen-handler"; -import {HubblePosterScreenHandler} from "../../index"; -import {Get, Post, Request, Route, Security, Tags} from "tsoa"; -import {SecurityNames} from "../../../../../helpers/security"; -import {securityGroups} from "../../../../../helpers/security-groups"; -import {Request as ExpressRequest} from "express"; -import {FeatureEnabled} from "../../../../server-settings"; +import { BasePosterResponse, BasePosterScreenController } from '../base-poster-screen-controller'; +import HandlerManager from '../../../../root/handler-manager'; +import { Screen } from '../../../../root/entities'; +import BasePosterScreenHandler from '../base-poster-screen-handler'; +import { HubblePosterScreenHandler } from '../../index'; +import { Get, Post, Request, Route, Security, Tags } from 'tsoa'; +import { SecurityNames } from '../../../../../helpers/security'; +import { securityGroups } from '../../../../../helpers/security-groups'; +import { Request as ExpressRequest } from 'express'; +import { FeatureEnabled } from '../../../../server-settings'; @Route('handler/screen/hubble-poster') @Tags('Handlers') @FeatureEnabled('HubblePosterScreenHandler') export class HubblePosterScreenController extends BasePosterScreenController { - constructor() { - super(); - this.screenHandler = HandlerManager.getInstance() - .getHandlers(Screen) - .filter((h) => h.constructor.name === HubblePosterScreenHandler.name)[0] as BasePosterScreenHandler; - } + constructor() { + super(); + this.screenHandler = HandlerManager.getInstance() + .getHandlers(Screen) + .filter( + (h) => h.constructor.name === HubblePosterScreenHandler.name, + )[0] as BasePosterScreenHandler; + } - @Security(SecurityNames.LOCAL, securityGroups.poster.base) - @Get('') - public async getHubblePosters(): Promise { - return super.getPosters(); - } + @Security(SecurityNames.LOCAL, securityGroups.poster.base) + @Get('') + public async getHubblePosters(): Promise { + return super.getPosters(); + } - @Security(SecurityNames.LOCAL, securityGroups.poster.privileged) - @Post('force-update') - public async forceUpdateHubblePosters(@Request() req: ExpressRequest): Promise { - super.forceUpdatePosters(req); - } -} \ No newline at end of file + @Security(SecurityNames.LOCAL, securityGroups.poster.privileged) + @Post('force-update') + public async forceUpdateHubblePosters(@Request() req: ExpressRequest): Promise { + super.forceUpdatePosters(req); + } +} diff --git a/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-handler.ts b/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-handler.ts index 0714190..04b2fe3 100644 --- a/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-handler.ts +++ b/src/modules/handlers/screen/poster/hubble/hubble-poster-screen-handler.ts @@ -1,10 +1,10 @@ -import BasePosterScreenHandler from "../base-poster-screen-handler"; -import { Namespace } from "socket.io"; -import {FeatureEnabled} from "../../../../server-settings"; +import BasePosterScreenHandler from '../base-poster-screen-handler'; +import { Namespace } from 'socket.io'; +import { FeatureEnabled } from '../../../../server-settings'; @FeatureEnabled('HubblePosterScreenHandler') export default class HubblePosterScreenHandler extends BasePosterScreenHandler { - constructor(socket: Namespace) { - super(socket); - } -} \ No newline at end of file + constructor(socket: Namespace) { + super(socket); + } +} diff --git a/src/modules/handlers/screen/poster/trello/trello-poster-manager.ts b/src/modules/handlers/screen/poster/trello/trello-poster-manager.ts index b93e35f..98a829c 100644 --- a/src/modules/handlers/screen/poster/trello/trello-poster-manager.ts +++ b/src/modules/handlers/screen/poster/trello/trello-poster-manager.ts @@ -119,9 +119,11 @@ export class TrelloPosterManager extends PosterManager { const labels = card.labels?.map((l) => l.name ?? '') ?? []; const hideBorder = labels.includes('HIDE_BORDER'); - const footers = labels.filter((l) => !['HIDE_BORDER', 'BorrelMode'].includes(l) && !l.startsWith('#')); + const footers = labels.filter( + (l) => !['HIDE_BORDER', 'BorrelMode'].includes(l) && !l.startsWith('#'), + ); - let color = labels.find(l => l.startsWith('#')); + let color = labels.find((l) => l.startsWith('#')); return { id: card.id ?? randomUUID(), @@ -134,7 +136,7 @@ export class TrelloPosterManager extends PosterManager { // If the card has a HIDE_LABEL label, set the footer size to minimal footer: hideBorder ? FooterSize.MINIMAL : FooterSize.FULL, borrelMode, - color + color, }; }