summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/components/signup.vue10
-rw-r--r--src/client/directives/tooltip.ts14
-rw-r--r--src/client/init.ts5
-rw-r--r--src/client/os.ts6
-rw-r--r--src/client/pages/about-misskey.vue2
-rw-r--r--src/client/pages/instance/other-settings.vue6
-rw-r--r--src/client/style.scss7
-rw-r--r--src/docs/eo-UY/advanced/create-plugin.md2
-rw-r--r--src/models/entities/meta.ts5
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts8
-rw-r--r--src/server/api/endpoints/meta.ts2
-rw-r--r--src/server/api/endpoints/notes/translate.ts4
-rw-r--r--src/server/file/index.ts4
-rw-r--r--src/server/proxy/index.ts4
-rw-r--r--src/server/web/boot.js4
15 files changed, 66 insertions, 17 deletions
diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue
index b0b0c2ad4d..d584b97209 100644
--- a/src/client/components/signup.vue
+++ b/src/client/components/signup.vue
@@ -1,12 +1,12 @@
<template>
-<form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
+<form class="qlvuhzng" @submit.prevent="onSubmit" :autocomplete="Math.random()">
<template v-if="meta">
- <MkInput v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
+ <MkInput class="_inputNoTopMargin" v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
<template #label>{{ $ts.invitationCode }}</template>
<template #prefix><i class="fas fa-key"></i></template>
</MkInput>
- <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:modelValue="onChangeUsername" data-cy-signup-username>
- <template #label>{{ $ts.username }}</template>
+ <MkInput class="_inputNoTopMargin" v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:modelValue="onChangeUsername" data-cy-signup-username>
+ <template #label>{{ $ts.username }} <div class="_button _help" v-tooltip:dialog="$ts.usernameInfo"><i class="far fa-question-circle"></i></div></template>
<template #prefix>@</template>
<template #suffix>@{{ host }}</template>
<template #caption>
@@ -204,7 +204,7 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
-.mk-signup {
+.qlvuhzng {
.captcha {
margin: 16px 0;
}
diff --git a/src/client/directives/tooltip.ts b/src/client/directives/tooltip.ts
index 90247eacb2..ee690558af 100644
--- a/src/client/directives/tooltip.ts
+++ b/src/client/directives/tooltip.ts
@@ -1,6 +1,6 @@
import { Directive, ref } from 'vue';
import { isDeviceTouch } from '@client/scripts/is-device-touch';
-import { popup } from '@client/os';
+import { popup, dialog } from '@client/os';
const start = isDeviceTouch ? 'touchstart' : 'mouseover';
const end = isDeviceTouch ? 'touchend' : 'mouseleave';
@@ -24,6 +24,18 @@ export default {
}
};
+ if (binding.arg === 'dialog') {
+ el.addEventListener('click', (ev) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+ dialog({
+ type: 'info',
+ text: binding.value,
+ });
+ return false;
+ });
+ }
+
const show = e => {
if (!document.body.contains(el)) return;
if (self._close) return;
diff --git a/src/client/init.ts b/src/client/init.ts
index 194ece886b..4d2170e03f 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -101,15 +101,12 @@ window.addEventListener('resize', () => {
});
//#endregion
-// Get the <head> element
-const head = document.getElementsByTagName('head')[0];
-
// If mobile, insert the viewport meta tag
if (isMobile || window.innerWidth <= 1024) {
const viewport = document.getElementsByName('viewport').item(0);
viewport.setAttribute('content',
`${viewport.getAttribute('content')},minimum-scale=1,maximum-scale=1,user-scalable=no`);
- head.appendChild(viewport);
+ document.head.appendChild(viewport);
}
//#region Set lang attr
diff --git a/src/client/os.ts b/src/client/os.ts
index 284f982f06..8125332798 100644
--- a/src/client/os.ts
+++ b/src/client/os.ts
@@ -214,7 +214,11 @@ export function modalPageWindow(path: string) {
}, {}, 'closed');
}
-export function dialog(props: Record<string, any>) {
+export function dialog(props: {
+ type: 'error' | 'info' | 'success' | 'warning' | 'waiting';
+ title?: string | null;
+ text?: string | null;
+}) {
return new Promise((resolve, reject) => {
popup(import('@client/components/dialog.vue'), props, {
done: result => {
diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue
index a324ebce5c..384c7e8ccb 100644
--- a/src/client/pages/about-misskey.vue
+++ b/src/client/pages/about-misskey.vue
@@ -60,7 +60,7 @@ import FormBase from '@client/components/form/base.vue';
import FormGroup from '@client/components/form/group.vue';
import FormKeyValueView from '@client/components/form/key-value-view.vue';
import MkLink from '@client/components/link.vue';
-import { physics } from '@client/scripts/physics.ts';
+import { physics } from '@client/scripts/physics';
import * as symbols from '@client/symbols';
const patrons = [
diff --git a/src/client/pages/instance/other-settings.vue b/src/client/pages/instance/other-settings.vue
index 8002528931..4fa80b2b2c 100644
--- a/src/client/pages/instance/other-settings.vue
+++ b/src/client/pages/instance/other-settings.vue
@@ -12,6 +12,9 @@
<template #prefix><i class="fas fa-key"></i></template>
DeepL Auth Key
</FormInput>
+ <FormSwitch v-model:value="deeplIsPro">
+ Pro account
+ </FormSwitch>
</FormGroup>
<FormButton @click="save" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
</FormSuspense>
@@ -50,6 +53,7 @@ export default defineComponent({
},
summalyProxy: '',
deeplAuthKey: '',
+ deeplIsPro: false,
}
},
@@ -62,11 +66,13 @@ export default defineComponent({
const meta = await os.api('meta', { detail: true });
this.summalyProxy = meta.summalyProxy;
this.deeplAuthKey = meta.deeplAuthKey;
+ this.deeplIsPro = meta.deeplIsPro;
},
save() {
os.apiWithDialog('admin/update-meta', {
summalyProxy: this.summalyProxy,
deeplAuthKey: this.deeplAuthKey,
+ deeplIsPro: this.deeplIsPro,
}).then(() => {
fetchInstance();
});
diff --git a/src/client/style.scss b/src/client/style.scss
index a6c027745a..269cf88939 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -156,8 +156,10 @@ hr {
._button {
appearance: none;
+ display: inline-block;
padding: 0;
margin: 0; // for Safari
+ width: max-content;
background: none;
border: none;
cursor: pointer;
@@ -201,6 +203,11 @@ hr {
}
}
+._help {
+ color: var(--accent);
+ cursor: help
+}
+
._textButton {
@extend ._button;
color: var(--accent);
diff --git a/src/docs/eo-UY/advanced/create-plugin.md b/src/docs/eo-UY/advanced/create-plugin.md
index 0d2fa19178..2a5af72917 100644
--- a/src/docs/eo-UY/advanced/create-plugin.md
+++ b/src/docs/eo-UY/advanced/create-plugin.md
@@ -5,7 +5,7 @@ Misskey Webクライアントのプラグイン機能を使うと、クライア
プラグインは、AiScriptのメタデータ埋め込み機能を使って、デフォルトとしてプラグインのメタデータを定義する必要があります。 メタデータは次のプロパティを含むオブジェクトです。
### name
-プラグイン名
+Nomo de kromaĵo
### author
プラグイン作者
diff --git a/src/models/entities/meta.ts b/src/models/entities/meta.ts
index 2a0632c87c..6428aacdf1 100644
--- a/src/models/entities/meta.ts
+++ b/src/models/entities/meta.ts
@@ -319,6 +319,11 @@ export class Meta {
})
public deeplAuthKey: string | null;
+ @Column('boolean', {
+ default: false,
+ })
+ public deeplIsPro: boolean;
+
@Column('varchar', {
length: 512,
nullable: true
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index 5962dba98a..46f30fef7d 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -149,6 +149,10 @@ export const meta = {
validator: $.optional.nullable.str,
},
+ deeplIsPro: {
+ validator: $.optional.bool,
+ },
+
enableTwitterIntegration: {
validator: $.optional.bool,
},
@@ -574,6 +578,10 @@ export default define(meta, async (ps, me) => {
}
}
+ if (ps.deeplIsPro !== undefined) {
+ set.deeplIsPro = ps.deeplIsPro;
+ }
+
await getConnection().transaction(async transactionalEntityManager => {
const meta = await transactionalEntityManager.findOne(Meta, {
order: {
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 1c87952f6a..3f422dff07 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -583,6 +583,8 @@ export default define(meta, async (ps, me) => {
response.objectStorageUseProxy = instance.objectStorageUseProxy;
response.objectStorageSetPublicRead = instance.objectStorageSetPublicRead;
response.objectStorageS3ForcePathStyle = instance.objectStorageS3ForcePathStyle;
+ response.deeplAuthKey = instance.deeplAuthKey;
+ response.deeplIsPro = instance.deeplIsPro;
}
}
diff --git a/src/server/api/endpoints/notes/translate.ts b/src/server/api/endpoints/notes/translate.ts
index a5fdf70ce6..e4bc6bb060 100644
--- a/src/server/api/endpoints/notes/translate.ts
+++ b/src/server/api/endpoints/notes/translate.ts
@@ -61,7 +61,9 @@ export default define(meta, async (ps, user) => {
params.append('text', note.text);
params.append('target_lang', targetLang);
- const res = await fetch('https://api-free.deepl.com/v2/translate', {
+ const endpoint = instance.deeplIsPro ? 'https://api.deepl.com/v2/translate' : 'https://api-free.deepl.com/v2/translate';
+
+ const res = await fetch(endpoint, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
diff --git a/src/server/file/index.ts b/src/server/file/index.ts
index 9b5d8f7267..a455acd1cf 100644
--- a/src/server/file/index.ts
+++ b/src/server/file/index.ts
@@ -17,6 +17,10 @@ const _dirname = dirname(_filename);
// Init app
const app = new Koa();
app.use(cors());
+app.use(async (ctx, next) => {
+ ctx.set('Content-Security-Policy', `default-src 'none'; style-src 'unsafe-inline'`);
+ await next();
+});
// Init router
const router = new Router();
diff --git a/src/server/proxy/index.ts b/src/server/proxy/index.ts
index 9ef198d31b..b8993f19f8 100644
--- a/src/server/proxy/index.ts
+++ b/src/server/proxy/index.ts
@@ -10,6 +10,10 @@ import { proxyMedia } from './proxy-media';
// Init app
const app = new Koa();
app.use(cors());
+app.use(async (ctx, next) => {
+ ctx.set('Content-Security-Policy', `default-src 'none'; style-src 'unsafe-inline'`);
+ await next();
+});
// Init router
const router = new Router();
diff --git a/src/server/web/boot.js b/src/server/web/boot.js
index e2fd137f95..7a41ae2555 100644
--- a/src/server/web/boot.js
+++ b/src/server/web/boot.js
@@ -60,8 +60,6 @@
? `?salt=${localStorage.getItem('salt')}`
: '';
- const head = document.getElementsByTagName('head')[0];
-
const script = document.createElement('script');
script.setAttribute('src', `/assets/app.${v}.js${salt}`);
script.setAttribute('async', 'true');
@@ -70,7 +68,7 @@
renderError('APP_FETCH_FAILED');
checkUpdate();
});
- head.appendChild(script);
+ document.head.appendChild(script);
//#endregion
//#region Theme
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-17 18:53:57 +0000