woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

fix linter issues
Some checks failed
API report (misskey.js) / report (pull_request) Successful in 2m40s
Details
Test (backend) / unit (22.x) (pull_request) Successful in 3m59s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 1m43s
Details
Test (misskey.js) / test (22.x) (pull_request) Successful in 1m8s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 1m20s
Details
Test (backend) / validate-api-json (22.x) (pull_request) Successful in 2m1s
Details
Test (backend) / e2e (22.x) (pull_request) Successful in 6m56s
Details
Lint / pnpm_install (pull_request) Successful in 3m48s
Details
Lint / lint (backend) (pull_request) Successful in 1m31s
Details
Lint / lint (misskey-js) (pull_request) Successful in 1m47s
Details
Lint / lint (sw) (pull_request) Successful in 1m22s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 1m45s
Details
Lint / lint (frontend) (pull_request) Successful in 8m54s
Details
Lint / typecheck (backend) (pull_request) Failing after 1m14s
Details

Browse source
This commit is contained in:
Leah 2025-02-03 16:09:15 +01:00
parent b8a938ace8
commit 1090365cc0
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/EmailService.ts
View file

@ -166,7 +166,7 @@ export class EmailService {
const emailTemplateSource = meta.emailTemplate ?? EmailService.defaultEmailTemplate; const emailTemplateSource = meta.emailTemplate ?? EmailService.defaultEmailTemplate;
// console.log(handlebar.) // console.log(handlebar.)
const template = handlebars.compile(emailTemplateSource) const template = handlebars.compile(emailTemplateSource);
const htmlToSend = template({ const htmlToSend = template({
subject, subject,
@ -175,7 +175,7 @@ export class EmailService {
logo: meta.logoImageUrl ?? meta.iconUrl ?? iconUrl, logo: meta.logoImageUrl ?? meta.iconUrl ?? iconUrl,
url: this.config.url, url: this.config.url,
host: this.config.host, host: this.config.host,
}) });
const transporter = nodemailer.createTransport({ const transporter = nodemailer.createTransport({
host: meta.smtpHost, host: meta.smtpHost,

2
packages/backend/src/server/api/endpoints/admin/meta.ts
View file

@ -9,7 +9,7 @@ import { MetaService } from '@/core/MetaService.js';
import type { Config } from '@/config.js'; import type { Config } from '@/config.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js';
import {EmailService} from "@/core/EmailService.js"; import { EmailService } from "@/core/EmailService.js";
export const meta = { export const meta = {
tags: ['meta'], tags: ['meta'],

8
packages/frontend/src/pages/admin/email-settings.vue
View file

@ -52,10 +52,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.customEmailTemplate.description }}</template> <template #label>{{ i18n.ts.customEmailTemplate.description }}</template>
</MkCodeEditor> </MkCodeEditor>
<I18n :src="i18n.ts.customEmailTemplate.reference" tag="small"> <I18n :src="i18n.ts.customEmailTemplate.reference" tag="small">
<template #link> <template #link>
<a href="https://www.caniemail.com/">https://www.caniemail.com/</a> <a href="https://www.caniemail.com/">https://www.caniemail.com/</a>
</template> </template>
</I18n> </I18n>
</div> </div>
</MkFolder> </MkFolder>
</div> </div>