diff options
| author | okayurisotto <okayurisotto@proton.me> | 2023-07-08 07:08:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-08 07:08:16 +0900 |
| commit | d84796588c1472334ddaf696a817f015c245ce44 (patch) | |
| tree | 45caa2d8659d35b90bc3f36170e764aa5eb90b70 /packages/backend/src/core/EmailService.ts | |
| parent | perf(backend): Improve performance of FetchInstanceMetadata (#11128) (diff) | |
| download | sharkey-d84796588c1472334ddaf696a817f015c245ce44.tar.gz sharkey-d84796588c1472334ddaf696a817f015c245ce44.tar.bz2 sharkey-d84796588c1472334ddaf696a817f015c245ce44.zip | |
cleanup: trim trailing whitespace (#11136)
* cleanup: trim trailing whitespace
* update(`.editorconfig`)
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/core/EmailService.ts')
| -rw-r--r-- | packages/backend/src/core/EmailService.ts | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts index 59932a5b88..a04e9c1225 100644 --- a/packages/backend/src/core/EmailService.ts +++ b/packages/backend/src/core/EmailService.ts @@ -29,12 +29,12 @@ export class EmailService { @bindThis public async sendEmail(to: string, subject: string, html: string, text: string) { const meta = await this.metaService.fetch(true); - + const iconUrl = `${this.config.url}/static-assets/mi-white.png`; const emailSettingUrl = `${this.config.url}/settings/email`; - + const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; - + const transporter = nodemailer.createTransport({ host: meta.smtpHost, port: meta.smtpPort, @@ -46,7 +46,7 @@ export class EmailService { pass: meta.smtpPass, } : undefined, } as any); - + try { // TODO: htmlサニタイズ const info = await transporter.sendMail({ @@ -135,7 +135,7 @@ export class EmailService { </body> </html>`, }); - + this.logger.info(`Message sent: ${info.messageId}`); } catch (err) { this.logger.error(err as Error); @@ -149,12 +149,12 @@ export class EmailService { reason: null | 'used' | 'format' | 'disposable' | 'mx' | 'smtp'; }> { const meta = await this.metaService.fetch(); - + const exist = await this.userProfilesRepository.countBy({ emailVerified: true, email: emailAddress, }); - + const validated = meta.enableActiveEmailValidation ? await validateEmail({ email: emailAddress, validateRegex: true, @@ -163,9 +163,9 @@ export class EmailService { validateDisposable: true, // 捨てアドかどうかチェック validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので }) : { valid: true, reason: null }; - + const available = exist === 0 && validated.valid; - + return { available, reason: available ? null : |