diff --git a/index.ts b/index.ts index e504882..a7c4188 100644 --- a/index.ts +++ b/index.ts @@ -9,33 +9,22 @@ const client = new GithubAPIClient(); export default async (req: ServerRequest) => { const params = parseParams(req); const username = params.get("username"); - let row = CONSTANTS.DEFAULT_MAX_ROW; - let column = CONSTANTS.DEFAULT_MAX_COLUMN; + const row = params.getNumberValue("row", CONSTANTS.DEFAULT_MAX_ROW); + const column = params.getNumberValue("column", CONSTANTS.DEFAULT_MAX_COLUMN); + const paddingWidth = params.getNumberValue("padding-w", CONSTANTS.DEFAULT_PADDING_W); + const paddingHeight = params.getNumberValue("padding-h", CONSTANTS.DEFAULT_PADDING_H); let titles: Array = params.getAll("title").flatMap((r) => r.split(",") ).map((r) => r.trim()); let ranks: Array = params.getAll("rank").flatMap((r) => r.split(",")) .map((r) => r.trim()); - if (params.has("row")) { - const param = params.get("row"); - if (param != null) { - row = parseInt(param); - } - } - - if (params.has("column")) { - const param = params.get("column"); - if (param != null) { - column = parseInt(param); - } - } if (username != null) { const userInfo = await client.requestUserInfo(username); if (userInfo !== null) { req.respond( { - body: new Card(titles, ranks, column, row).render(userInfo), + body: new Card(titles, ranks, column, row, CONSTANTS.DEFAULT_PANEL_SIZE, paddingWidth, paddingHeight).render(userInfo), headers: new Headers( { "Content-Type": "image/svg+xml", diff --git a/src/card.ts b/src/card.ts index c2a5d9c..e9d266f 100644 --- a/src/card.ts +++ b/src/card.ts @@ -20,9 +20,11 @@ export class Card { constructor( private titles: Array, private ranks: Array, - private maxColumn = CONSTANTS.DEFAULT_MAX_COLUMN, - private maxRow = CONSTANTS.DEFAULT_MAX_ROW, - private panelSize = CONSTANTS.DEFAULT_PANEL_SIZE, + private maxColumn: number, + private maxRow: number, + private panelSize: number, + private paddingWidth: number, + private paddingHight: number ) { this.width = panelSize * this.maxColumn; } diff --git a/src/utils.ts b/src/utils.ts index e546ec9..7d00be8 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,11 +1,38 @@ import { ServerRequest } from ".././deps.ts"; -export function parseParams(req: ServerRequest): URLSearchParams { + +export class CustomURLSearchParams extends URLSearchParams { + constructor(init?: string[][] | Record | string | URLSearchParams,) { + super(init); + } + getStringValue(key: string, defaultValue: string): string{ + let value: string = defaultValue; + if (super.has(key)) { + const param = super.get(key); + if (param !== null) { + return param.toString(); + } + } + return value.toString(); + } + getNumberValue(key: string, defaultValue: number): number { + let value: number = defaultValue; + if (super.has(key)) { + const param = super.get(key); + if (param !== null) { + return parseInt(param); + } + } + return value; + } +} + +export function parseParams(req: ServerRequest): CustomURLSearchParams { const splitedURL = req.url.split("?"); if (splitedURL.length < 2) { - return new URLSearchParams(); + return new CustomURLSearchParams(); } - return new URLSearchParams(splitedURL[1]); + return new CustomURLSearchParams(splitedURL[1]); } export function abridgeScore(score: number): string { @@ -23,6 +50,8 @@ export const CONSTANTS = { DEFAULT_PANEL_SIZE: 110, DEFAULT_MAX_COLUMN: 6, DEFAULT_MAX_ROW: 3, + DEFAULT_PADDING_W: 0, + DEFAULT_PADDING_H: 0, }; export enum RANK {