From ebc92307437e8548f695cb6834cdfb04ba775868 Mon Sep 17 00:00:00 2001 From: Matthieu Jolimaitre Date: Fri, 2 Feb 2024 23:58:25 +0100 Subject: [PATCH 1/2] fix typo --- src/email.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/email.ts b/src/email.ts index c712ed9..407357b 100644 --- a/src/email.ts +++ b/src/email.ts @@ -46,7 +46,7 @@ export class Emailer { } } -const CONFIRMATION_EMAIL_SUBJECT = "Confirmation d'association à un compte discord"; +const CONFIRMATION_EMAIL_SUBJECT = "[epiTLS] Confirmation d'association à un compte discord."; function confirmation_email_body(discord_username: string, link: string) { return ` @@ -65,7 +65,7 @@ Si vous n'êtes pas à l'origine de cette demande, veuillez ignorer ce message. --- Je suis un robot et cette action à été effectuée automatiquement. -Vous pouvez contacter le développeur de se service à l'email matthieu at imagevo dot fr. +Vous pouvez contacter le développeur de ce service à l'email matthieu at imagevo dot fr. From bfb53d5c64eb21eb32943ab168137f9cec1ee493 Mon Sep 17 00:00:00 2001 From: Matthieu Jolimaitre Date: Mon, 5 Feb 2024 01:33:10 +0100 Subject: [PATCH 2/2] improve logging api --- src/bot.ts | 2 +- src/cri.ts | 2 +- src/email.ts | 2 +- src/main.ts | 2 +- src/utils.ts | 4 ++-- src/verifier.ts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bot.ts b/src/bot.ts index 993b2c1..09184e5 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -10,7 +10,7 @@ import { SlashCommandStringOption, } from "npm:discord.js@14.14.1"; import { channel, log_from, SimpleResult, split_promise } from "./utils.ts"; -const log = (...args: unknown[]) => log_from(import.meta.url, ...args); +const log = log_from(import.meta.url); /** * Wraps a discord bot and implements required actions. diff --git a/src/cri.ts b/src/cri.ts index 5c0d8c9..75e1fff 100644 --- a/src/cri.ts +++ b/src/cri.ts @@ -1,6 +1,6 @@ import { z } from "https://deno.land/x/zod@v3.22.4/mod.ts"; import { log_from } from "./utils.ts"; -const log = (...args: unknown[]) => log_from(import.meta.url, ...args); +const log = log_from(import.meta.url); /** * Wraps the CRI API. diff --git a/src/email.ts b/src/email.ts index 407357b..6a1b776 100644 --- a/src/email.ts +++ b/src/email.ts @@ -1,6 +1,6 @@ import { ClientOptions, SMTPClient } from "https://deno.land/x/denomailer@1.6.0/mod.ts"; import { log_from } from "./utils.ts"; -const log = (...args: unknown[]) => log_from(import.meta.url, ...args); +const log = log_from(import.meta.url); export type EmailerConfig = { hostname: string; diff --git a/src/main.ts b/src/main.ts index 7c4912a..7234b0d 100755 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,7 @@ import { EpitlsBot } from "./bot.ts"; import { CriApi } from "./cri.ts"; import { Emailer } from "./email.ts"; import { WebVerifier } from "./verifier.ts"; -const log = (...args: unknown[]) => log_from(import.meta.url, ...args); +const log = log_from(import.meta.url); async function main() { const conf = await read_conf(root_path() + "/conf.json"); diff --git a/src/utils.ts b/src/utils.ts index 1acda34..b449060 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -51,10 +51,10 @@ export type Resolver = (item: T) => void; /** * Logging function factory. */ -export function log_from(url: string, ...args: unknown[]) { +export function log_from(url: string) { const date = new Date().toLocaleString("fr-FR"); const file = path.basename(new URL(url).pathname); - console.log(`[${date}][epitls][${file}]`, ...args); + return (...args: unknown[]) => console.log(`[${date}][epitls][${file}]`, ...args); } export type Conf = Awaited>; diff --git a/src/verifier.ts b/src/verifier.ts index e37d154..0898175 100644 --- a/src/verifier.ts +++ b/src/verifier.ts @@ -1,6 +1,6 @@ import { v1 as uuid } from "https://deno.land/std@0.213.0/uuid/mod.ts"; import { channel, log_from, Resolver, SimpleResult, split_promise, wait } from "./utils.ts"; -const log = (...args: unknown[]) => log_from(import.meta.url, ...args); +const log = log_from(import.meta.url); export type WebVerifierConf = { port: number;