From 246693b8484b72048cb515b76aa5f094f5fdeb56 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 22 Apr 2021 22:29:33 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E4=BD=9C?= =?UTF-8?q?=E3=82=8A=E7=9B=B4=E3=81=97=20(#7473)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * wip * wip * wip --- locales/ja-JP.yml | 13 +- package.json | 2 +- src/client/components/captcha.vue | 4 +- src/client/components/form/base.vue | 2 + src/client/components/form/form.scss | 4 +- src/client/components/form/key-value-view.vue | 2 +- src/client/components/form/object-view.vue | 2 +- src/client/components/form/radios.vue | 3 + src/client/components/form/suspense.vue | 9 +- src/client/components/instance-stats.vue | 252 +------- src/client/components/signup.vue | 2 +- src/client/components/tab.vue | 1 + src/client/components/ui/pagination.vue | 34 +- src/client/pages/instance/abuses.vue | 12 +- src/client/pages/instance/announcements.vue | 52 +- src/client/pages/instance/bot-protection.vue | 138 ++++ src/client/pages/instance/database.vue | 60 ++ src/client/pages/instance/email-settings.vue | 127 ++++ src/client/pages/instance/emojis.vue | 213 +++--- src/client/pages/instance/federation.vue | 115 ++-- src/client/pages/instance/file-dialog.vue | 4 +- src/client/pages/instance/files-settings.vue | 92 +++ src/client/pages/instance/files.vue | 8 + src/client/pages/instance/index.vue | 362 ++++++----- src/client/pages/instance/instance-block.vue | 71 ++ .../pages/instance/integrations-discord.vue | 85 +++ .../pages/instance/integrations-github.vue | 85 +++ .../pages/instance/integrations-twitter.vue | 85 +++ src/client/pages/instance/integrations.vue | 73 +++ .../{index.metrics.vue => metrics.vue} | 243 ++----- src/client/pages/instance/object-storage.vue | 154 +++++ src/client/pages/instance/other-settings.vue | 68 ++ src/client/pages/instance/overview.vue | 131 ++++ src/client/pages/instance/proxy-account.vue | 86 +++ src/client/pages/instance/queue.chart.vue | 66 +- src/client/pages/instance/queue.vue | 24 +- src/client/pages/instance/relays.vue | 50 +- src/client/pages/instance/security.vue | 77 +++ src/client/pages/instance/service-worker.vue | 84 +++ src/client/pages/instance/settings.vue | 607 +++--------------- src/client/pages/instance/user-dialog.vue | 230 ------- src/client/pages/instance/user.vue | 229 +++++++ src/client/pages/instance/users.vue | 259 ++++---- src/client/pages/user-info.vue | 70 +- src/client/pages/user/index.vue | 2 +- src/client/router.ts | 12 +- src/client/scripts/get-user-menu.ts | 8 +- src/client/scripts/lookup-user.ts | 37 ++ src/client/ui/_common_/sidebar.vue | 63 +- src/client/ui/default.sidebar.vue | 63 +- 50 files changed, 2588 insertions(+), 1887 deletions(-) create mode 100644 src/client/pages/instance/bot-protection.vue create mode 100644 src/client/pages/instance/database.vue create mode 100644 src/client/pages/instance/email-settings.vue create mode 100644 src/client/pages/instance/files-settings.vue create mode 100644 src/client/pages/instance/instance-block.vue create mode 100644 src/client/pages/instance/integrations-discord.vue create mode 100644 src/client/pages/instance/integrations-github.vue create mode 100644 src/client/pages/instance/integrations-twitter.vue create mode 100644 src/client/pages/instance/integrations.vue rename src/client/pages/instance/{index.metrics.vue => metrics.vue} (60%) create mode 100644 src/client/pages/instance/object-storage.vue create mode 100644 src/client/pages/instance/other-settings.vue create mode 100644 src/client/pages/instance/overview.vue create mode 100644 src/client/pages/instance/proxy-account.vue create mode 100644 src/client/pages/instance/security.vue create mode 100644 src/client/pages/instance/service-worker.vue delete mode 100644 src/client/pages/instance/user-dialog.vue create mode 100644 src/client/pages/instance/user.vue create mode 100644 src/client/scripts/lookup-user.ts diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 989edcda2d..b557f86436 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -183,7 +183,7 @@ clearQueueConfirmTitle: "キューをクリアしますか？" clearQueueConfirmText: "未配達の投稿は配送されなくなります。通常この操作を行う必要はありません。" clearCachedFiles: "キャッシュをクリア" clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？" -blockedInstances: "インスタンスブロック" +blockedInstances: "ブロックしたインスタンス" blockedInstancesDescription: "ブロックしたいインスタンスのホストを改行で区切って設定します。ブロックされたインスタンスは、このインスタンスとやり取りできなくなります。" muteAndBlock: "ミュートとブロック" mutedUsers: "ミュートしたユーザー" @@ -349,7 +349,6 @@ antennaExcludeKeywords: "除外キーワード" antennaKeywordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります" notifyAntenna: "新しいノートを通知する" withFileAntenna: "ファイルが添付されたノートのみ" -serviceworker: "ServiceWorker" enableServiceworker: "ServiceWorkerを有効にする" antennaUsersDescription: "ユーザー名を改行で区切って指定します" caseSensitive: "大文字小文字を区別する" @@ -568,7 +567,7 @@ pluginTokenRequestedDescription: "このプラグインはここで設定した notificationType: "通知の種類" edit: "編集" useStarForReactionFallback: "リアクション絵文字が不明な場合、代わりに★を使う" -emailConfig: "メールサーバー設定" +emailServer: "メールサーバー" enableEmail: "メール配信機能を有効化する" emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います" email: "メール" @@ -728,6 +727,14 @@ hideOnlineStatusDescription: "オンライン状態を隠すと、検索など online: "オンライン" active: "アクティブ" offline: "オフライン" +notRecommended: "非推奨" +botProtection: "Bot防御" +instanceBlocking: "インスタンスブロック" +selectAccount: "アカウントを選択" +enabled: "有効" +disabled: "無効" +quickAction: "クイックアクション" +user: "ユーザー" _email: _follow: diff --git a/package.json b/package.json index 26aacae492..c6fd1a0227 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.78.0-beta.2", + "version": "12.78.0-beta.3", "codename": "indigo", "repository": { "type": "git", diff --git a/src/client/components/captcha.vue b/src/client/components/captcha.vue index 710fcd6169..26215df09d 100644 --- a/src/client/components/captcha.vue +++ b/src/client/components/captcha.vue @@ -18,7 +18,7 @@ type Captcha = { getResponse(id: string): string; }; -type CaptchaProvider = 'hcaptcha' | 'grecaptcha'; +type CaptchaProvider = 'hcaptcha' | 'recaptcha'; type CaptchaContainer = { readonly [_ in CaptchaProvider]?: Captcha; @@ -57,7 +57,7 @@ export default defineComponent({ src() { const endpoint = ({ hcaptcha: 'https://hcaptcha.com/1', - grecaptcha: 'https://www.recaptcha.net/recaptcha', + recaptcha: 'https://www.recaptcha.net/recaptcha', } as Record)[this.provider]; return `${typeof endpoint == 'string' ? endpoint : 'about:invalid'}/api.js?render=explicit`; diff --git a/src/client/components/form/base.vue b/src/client/components/form/base.vue index 34deb39465..132942d527 100644 --- a/src/client/components/form/base.vue +++ b/src/client/components/form/base.vue @@ -24,6 +24,8 @@ export default defineComponent({ --formXPadding: 32px; --formYPadding: 32px; + --formContentHMargin: 16px; + font-size: 95%; line-height: 1.3em; background: var(--bg); diff --git a/src/client/components/form/form.scss b/src/client/components/form/form.scss index 8c01fad727..05994ae650 100644 --- a/src/client/components/form/form.scss +++ b/src/client/components/form/form.scss @@ -30,7 +30,7 @@ top: var(--stickyTop, 0px); z-index: 2; margin: -8px calc(var(--formXPadding) * -1) 0 calc(var(--formXPadding) * -1); - padding: 8px calc(16px + var(--formXPadding)) 8px calc(16px + var(--formXPadding)); + padding: 8px calc(var(--formContentHMargin) + var(--formXPadding)) 8px calc(var(--formContentHMargin) + var(--formXPadding)); background: var(--X17); -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); @@ -42,7 +42,7 @@ } ._formCaption { - padding: 8px 16px 0 16px; + padding: 8px var(--formContentHMargin) 0 var(--formContentHMargin); } ._formItem { diff --git a/src/client/components/form/key-value-view.vue b/src/client/components/form/key-value-view.vue index 85f4febef9..ca4c09867f 100644 --- a/src/client/components/form/key-value-view.vue +++ b/src/client/components/form/key-value-view.vue @@ -20,7 +20,7 @@ export default defineComponent({ .anocepby { display: flex; align-items: center; - padding: 14px 16px; + padding: 14px var(--formContentHMargin); > .key { margin-right: 12px; diff --git a/src/client/components/form/object-view.vue b/src/client/components/form/object-view.vue index cbd4186e56..59fb62b5e6 100644 --- a/src/client/components/form/object-view.vue +++ b/src/client/components/form/object-view.vue @@ -75,7 +75,7 @@ export default defineComponent({ max-width: 100%; min-height: 130px; margin: 0; - padding: 16px; + padding: 16px var(--formContentHMargin); box-sizing: border-box; font: inherit; font-weight: normal; diff --git a/src/client/components/form/radios.vue b/src/client/components/form/radios.vue index 3daa7e5bbd..4cfb7c247e 100644 --- a/src/client/components/form/radios.vue +++ b/src/client/components/form/radios.vue @@ -18,6 +18,9 @@ export default defineComponent({ } }, watch: { + modelValue() { + this.value = this.modelValue; + }, value() { this.$emit('update:modelValue', this.value); } diff --git a/src/client/components/form/suspense.vue b/src/client/components/form/suspense.vue index 6a8282733f..2a48faccb3 100644 --- a/src/client/components/form/suspense.vue +++ b/src/client/components/form/suspense.vue @@ -5,9 +5,9 @@ - +
- +
error! @@ -20,13 +20,8 @@ diff --git a/src/client/pages/instance/bot-protection.vue b/src/client/pages/instance/bot-protection.vue new file mode 100644 index 0000000000..449b8a233d --- /dev/null +++ b/src/client/pages/instance/bot-protection.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/client/pages/instance/database.vue b/src/client/pages/instance/database.vue new file mode 100644 index 0000000000..a41d61ce2b --- /dev/null +++ b/src/client/pages/instance/database.vue @@ -0,0 +1,60 @@ + + + diff --git a/src/client/pages/instance/email-settings.vue b/src/client/pages/instance/email-settings.vue new file mode 100644 index 0000000000..9965a1420f --- /dev/null +++ b/src/client/pages/instance/email-settings.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index 88bebb40e0..fd641703cb 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -1,50 +1,46 @@ @@ -67,6 +63,8 @@ export default defineComponent({ MkPagination, }, + emits: ['info'], + data() { return { [symbols.PAGE_INFO]: { @@ -99,6 +97,10 @@ export default defineComponent({ } }, + async mounted() { + this.$emit('info', this[symbols.PAGE_INFO]); + }, + methods: { async add(e) { const files = await selectFile(e.currentTarget || e.target, null, true); @@ -150,85 +152,86 @@ export default defineComponent({ diff --git a/src/client/pages/instance/instance-block.vue b/src/client/pages/instance/instance-block.vue new file mode 100644 index 0000000000..ed5740f339 --- /dev/null +++ b/src/client/pages/instance/instance-block.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/client/pages/instance/integrations-discord.vue b/src/client/pages/instance/integrations-discord.vue new file mode 100644 index 0000000000..c7508918f8 --- /dev/null +++ b/src/client/pages/instance/integrations-discord.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations-github.vue b/src/client/pages/instance/integrations-github.vue new file mode 100644 index 0000000000..16586b15b4 --- /dev/null +++ b/src/client/pages/instance/integrations-github.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations-twitter.vue b/src/client/pages/instance/integrations-twitter.vue new file mode 100644 index 0000000000..b08b7f40a5 --- /dev/null +++ b/src/client/pages/instance/integrations-twitter.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations.vue b/src/client/pages/instance/integrations.vue new file mode 100644 index 0000000000..7debedc367 --- /dev/null +++ b/src/client/pages/instance/integrations.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/client/pages/instance/index.metrics.vue b/src/client/pages/instance/metrics.vue similarity index 60% rename from src/client/pages/instance/index.metrics.vue rename to src/client/pages/instance/metrics.vue index 9dd115240e..18cfe5eee2 100644 --- a/src/client/pages/instance/index.metrics.vue +++ b/src/client/pages/instance/metrics.vue @@ -1,101 +1,52 @@ @@ -188,9 +139,11 @@ export default defineComponent({ }, beforeUnmount() { - this.connection.off('stats', this.onStats); - this.connection.off('statsLog', this.onStatsLog); - this.connection.dispose(); + if (this.connection) { + this.connection.off('stats', this.onStats); + this.connection.off('statsLog', this.onStatsLog); + this.connection.dispose(); + } this.queueConnection.dispose(); }, @@ -232,9 +185,9 @@ export default defineComponent({ aspectRatio: 3, layout: { padding: { - left: 0, - right: 0, - top: 8, + left: 16, + right: 16, + top: 16, bottom: 0 } }, @@ -304,9 +257,9 @@ export default defineComponent({ aspectRatio: 3, layout: { padding: { - left: 0, - right: 0, - top: 8, + left: 16, + right: 16, + top: 16, bottom: 0 } }, @@ -375,9 +328,9 @@ export default defineComponent({ aspectRatio: 3, layout: { padding: { - left: 0, - right: 0, - top: 8, + left: 16, + right: 16, + top: 16, bottom: 0 } }, @@ -494,81 +447,9 @@ export default defineComponent({ diff --git a/src/client/pages/instance/object-storage.vue b/src/client/pages/instance/object-storage.vue new file mode 100644 index 0000000000..814aeb6e48 --- /dev/null +++ b/src/client/pages/instance/object-storage.vue @@ -0,0 +1,154 @@ + + + diff --git a/src/client/pages/instance/other-settings.vue b/src/client/pages/instance/other-settings.vue new file mode 100644 index 0000000000..b3954149a8 --- /dev/null +++ b/src/client/pages/instance/other-settings.vue @@ -0,0 +1,68 @@ + + + diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/instance/overview.vue new file mode 100644 index 0000000000..651ace08f9 --- /dev/null +++ b/src/client/pages/instance/overview.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/client/pages/instance/proxy-account.vue b/src/client/pages/instance/proxy-account.vue new file mode 100644 index 0000000000..3e2df8dcb4 --- /dev/null +++ b/src/client/pages/instance/proxy-account.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/client/pages/instance/queue.chart.vue b/src/client/pages/instance/queue.chart.vue index 0eb70debfb..446c979209 100644 --- a/src/client/pages/instance/queue.chart.vue +++ b/src/client/pages/instance/queue.chart.vue @@ -1,27 +1,29 @@ + + diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/instance/queue.vue index 0c1e0e51b5..2dccf48d31 100644 --- a/src/client/pages/instance/queue.vue +++ b/src/client/pages/instance/queue.vue @@ -1,43 +1,47 @@ diff --git a/src/client/pages/instance/security.vue b/src/client/pages/instance/security.vue new file mode 100644 index 0000000000..e3397a113b --- /dev/null +++ b/src/client/pages/instance/security.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/client/pages/instance/service-worker.vue b/src/client/pages/instance/service-worker.vue new file mode 100644 index 0000000000..a52932bb75 --- /dev/null +++ b/src/client/pages/instance/service-worker.vue @@ -0,0 +1,84 @@ + + + diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue index b827a77649..66f01c42c7 100644 --- a/src/client/pages/instance/settings.vue +++ b/src/client/pages/instance/settings.vue @@ -1,581 +1,132 @@ - - diff --git a/src/client/pages/instance/user.vue b/src/client/pages/instance/user.vue new file mode 100644 index 0000000000..fbc10a3672 --- /dev/null +++ b/src/client/pages/instance/user.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 4db965588c..452886abde 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -1,86 +1,71 @@ diff --git a/src/client/pages/instance/file-dialog.vue b/src/client/pages/instance/file-dialog.vue index ae6755465c..74a755fa15 100644 --- a/src/client/pages/instance/file-dialog.vue +++ b/src/client/pages/instance/file-dialog.vue @@ -82,7 +82,7 @@ export default defineComponent({ }, showUser() { - os.pageWindow(`/instance/user/${this.file.userId}`); + os.pageWindow(`/user-info/${this.file.userId}`); }, async del() { diff --git a/src/client/pages/instance/user.vue b/src/client/pages/instance/user.vue deleted file mode 100644 index fbc10a3672..0000000000 --- a/src/client/pages/instance/user.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 452886abde..2808b70fba 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -162,7 +162,7 @@ export default defineComponent({ }, show(user) { - os.pageWindow(`/instance/user/${user.id}`); + os.pageWindow(`/user-info/${user.id}`); }, acct diff --git a/src/client/pages/user-info.vue b/src/client/pages/user-info.vue index 378fbb7b50..090e8cdda8 100644 --- a/src/client/pages/user-info.vue +++ b/src/client/pages/user-info.vue @@ -1,35 +1,55 @@ @@ -38,6 +58,7 @@ import { computed, defineAsyncComponent, defineComponent } from 'vue'; import FormObjectView from '@client/components/form/object-view.vue'; import FormTextarea from '@client/components/form/textarea.vue'; +import FormSwitch from '@client/components/form/switch.vue'; import FormLink from '@client/components/form/link.vue'; import FormBase from '@client/components/form/base.vue'; import FormGroup from '@client/components/form/group.vue'; @@ -49,11 +70,13 @@ import number from '@client/filters/number'; import bytes from '@client/filters/bytes'; import * as symbols from '@client/symbols'; import { url } from '@client/config'; +import { userPage, acct } from '@client/filters/user'; export default defineComponent({ components: { FormBase, FormTextarea, + FormSwitch, FormObjectView, FormButton, FormLink, @@ -72,7 +95,7 @@ export default defineComponent({ data() { return { [symbols.PAGE_INFO]: computed(() => ({ - title: this.$ts.userInfo, + title: this.user ? acct(this.user) : this.$ts.userInfo, icon: 'fas fa-info-circle', actions: this.user ? [this.user.url ? { text: this.user.url, @@ -84,17 +107,23 @@ export default defineComponent({ })), init: null, user: null, + info: null, + moderator: false, + silenced: false, + suspended: false, + } + }, + + computed: { + iAmModerator(): boolean { + return this.$i && (this.$i.isAdmin || this.$i.isModerator); } }, watch: { userId: { handler() { - this.init = () => os.api('users/show', { - userId: this.userId - }).then(user => { - this.user = user; - }); + this.init = this.createFetcher(); }, immediate: true } @@ -103,6 +132,114 @@ export default defineComponent({ methods: { number, bytes, + userPage, + acct, + + createFetcher() { + if (this.iAmModerator) { + return () => Promise.all([os.api('users/show', { + userId: this.userId + }), os.api('admin/show-user', { + userId: this.userId + })]).then(([user, info]) => { + this.user = user; + this.info = info; + this.moderator = this.info.isModerator; + this.silenced = this.info.isSilenced; + this.suspended = this.info.isSuspended; + }); + } else { + return () => os.api('users/show', { + userId: this.userId + }).then((user) => { + this.user = user; + }); + } + }, + + refreshUser() { + this.init = this.createFetcher(); + }, + + async updateRemoteUser() { + await os.apiWithDialog('admin/update-remote-user', { userId: this.user.id }); + this.refreshUser(); + }, + + async resetPassword() { + os.apiWithDialog('admin/reset-password', { + userId: this.user.id, + }, undefined, ({ password }) => { + os.dialog({ + type: 'success', + text: this.$t('newPasswordIs', { password }) + }); + }); + }, + + async toggleSilence(v) { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: v ? this.$ts.silenceConfirm : this.$ts.unsilenceConfirm, + }); + if (confirm.canceled) { + this.silenced = !v; + } else { + await os.api(v ? 'admin/silence-user' : 'admin/unsilence-user', { userId: this.user.id }); + await this.refreshUser(); + } + }, + + async toggleSuspend(v) { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: v ? this.$ts.suspendConfirm : this.$ts.unsuspendConfirm, + }); + if (confirm.canceled) { + this.suspended = !v; + } else { + await os.api(v ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: this.user.id }); + await this.refreshUser(); + } + }, + + async toggleModerator(v) { + await os.api(v ? 'admin/moderators/add' : 'admin/moderators/remove', { userId: this.user.id }); + await this.refreshUser(); + }, + + async deleteAllFiles() { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: this.$ts.deleteAllFilesConfirm, + }); + if (confirm.canceled) return; + const process = async () => { + await os.api('admin/delete-all-files-of-a-user', { userId: this.user.id }); + os.success(); + }; + await process().catch(e => { + os.dialog({ + type: 'error', + text: e.toString() + }); + }); + await this.refreshUser(); + }, } }); + + diff --git a/src/client/router.ts b/src/client/router.ts index 93de287ea5..26a4dac499 100644 --- a/src/client/router.ts +++ b/src/client/router.ts @@ -59,7 +59,6 @@ export const router = createRouter({ { path: '/my/antennas', component: page('my-antennas/index') }, { path: '/my/clips', component: page('my-clips/index') }, { path: '/scratchpad', component: page('scratchpad') }, - { path: '/instance/user/:user', component: page('instance/user'), props: route => ({ userId: route.params.user }) }, { path: '/instance/:page(.*)?', component: page('instance/index'), props: route => ({ initialPage: route.params.page || null }) }, { path: '/instance', component: page('instance/index') }, { path: '/notes/:note', name: 'note', component: page('note'), props: route => ({ noteId: route.params.note }) }, diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts index 9a003b5c38..ceb2bfe173 100644 --- a/src/client/scripts/get-user-menu.ts +++ b/src/client/scripts/get-user-menu.ts @@ -124,13 +124,7 @@ export function getUserMenu(user) { action: () => { copyToClipboard(`@${user.username}@${user.host || host}`); } - }, ($i && ($i.isAdmin || $i.isModerator)) ? { - icon: 'fas fa-info-circle', - text: i18n.locale.info, - action: () => { - os.pageWindow(`/instance/user/${user.id}`); - } - } : { + }, { icon: 'fas fa-info-circle', text: i18n.locale.info, action: () => { diff --git a/src/client/scripts/lookup-user.ts b/src/client/scripts/lookup-user.ts index 1bcfd8e9db..269777d874 100644 --- a/src/client/scripts/lookup-user.ts +++ b/src/client/scripts/lookup-user.ts @@ -10,7 +10,7 @@ export async function lookupUser() { if (canceled) return; const show = (user) => { - os.pageWindow(`/instance/user/${user.id}`); + os.pageWindow(`/user-info/${user.id}`); }; const usernamePromise = os.api('users/show', parseAcct(result)); From dfa341e1c07edbf8317f731ab87099eb702325bf Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 12:05:15 +0900 Subject: [PATCH 05/15] Make admin/update-remote-user public --- src/client/pages/user-info.vue | 2 +- .../api/endpoints/{admin => federation}/update-remote-user.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename src/server/api/endpoints/{admin => federation}/update-remote-user.ts (94%) diff --git a/src/client/pages/user-info.vue b/src/client/pages/user-info.vue index 090e8cdda8..51bd5016bb 100644 --- a/src/client/pages/user-info.vue +++ b/src/client/pages/user-info.vue @@ -162,7 +162,7 @@ export default defineComponent({ }, async updateRemoteUser() { - await os.apiWithDialog('admin/update-remote-user', { userId: this.user.id }); + await os.apiWithDialog('federation/update-remote-user', { userId: this.user.id }); this.refreshUser(); }, diff --git a/src/server/api/endpoints/admin/update-remote-user.ts b/src/server/api/endpoints/federation/update-remote-user.ts similarity index 94% rename from src/server/api/endpoints/admin/update-remote-user.ts rename to src/server/api/endpoints/federation/update-remote-user.ts index 9577ac0a55..1b7a9c4d5b 100644 --- a/src/server/api/endpoints/admin/update-remote-user.ts +++ b/src/server/api/endpoints/federation/update-remote-user.ts @@ -10,10 +10,9 @@ export const meta = { 'en-US': 'Update specified remote user information.' }, - tags: ['admin'], + tags: ['federation'], requireCredential: true as const, - requireModerator: true, params: { userId: { From d61a74fb88f5f35356c4f0bf3c7e3d9b9810667e Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 12:17:04 +0900 Subject: [PATCH 06/15] fix style --- src/client/components/dialog.vue | 2 +- src/client/components/waiting-dialog.vue | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/client/components/dialog.vue b/src/client/components/dialog.vue index 83ea40922c..a673e827d6 100644 --- a/src/client/components/dialog.vue +++ b/src/client/components/dialog.vue @@ -8,7 +8,7 @@ - +
diff --git a/src/client/components/waiting-dialog.vue b/src/client/components/waiting-dialog.vue index 97f18842e2..ea9f6756b2 100644 --- a/src/client/components/waiting-dialog.vue +++ b/src/client/components/waiting-dialog.vue @@ -68,10 +68,9 @@ export default defineComponent({ padding: 0; width: 96px; height: 96px; - - > .icon { - height: 100%; - } + display: flex; + align-items: center; + justify-content: center; } > .icon { From 70a8dd30e034eb713a15e04ffdb9c7970c1303fc Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 13:01:52 +0900 Subject: [PATCH 07/15] Improve client --- locales/ja-JP.yml | 6 +- package.json | 2 +- src/client/pages/instance/index.vue | 8 +- src/client/pages/settings/accounts.vue | 148 +++++++++++++++++++++++++ src/client/pages/settings/index.vue | 20 ++++ src/client/ui/_common_/sidebar.vue | 8 +- src/client/ui/default.sidebar.vue | 8 +- 7 files changed, 187 insertions(+), 13 deletions(-) create mode 100644 src/client/pages/settings/accounts.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b557f86436..d20d720949 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -138,7 +138,7 @@ flagAsBotDescription: "このアカウントがプログラムによって運用 flagAsCat: "Catとして設定" flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。" autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認" -addAcount: "アカウント追加" +addAccount: "アカウントを追加" loginFailed: "ログインに失敗しました" showOnRemote: "リモートで表示" general: "全般" @@ -452,7 +452,7 @@ category: "カテゴリ" tags: "タグ" docSource: "このドキュメントのソース" createAccount: "アカウントを作成" -existingAcount: "既存のアカウント" +existingAccount: "既存のアカウント" regenerate: "再生成" fontSize: "フォントサイズ" noFollowRequests: "フォロー申請はありません" @@ -735,6 +735,8 @@ enabled: "有効" disabled: "無効" quickAction: "クイックアクション" user: "ユーザー" +administration: "管理" +accounts: "アカウント" _email: _follow: diff --git a/package.json b/package.json index 281bb67f3d..fc53fc4dc7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.78.0-beta.4", + "version": "12.78.0-beta.5", "codename": "indigo", "repository": { "type": "git", diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index 10406f339b..5972a02de0 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -16,13 +16,13 @@ {{ $ts.invite }} + {{ $ts.users }} {{ $ts.customEmojis }} {{ $ts.federation }} {{ $ts.jobQueue }} {{ $ts.files }} {{ $ts.announcements }} - {{ $ts.database }} {{ $ts.abuseReports }} @@ -39,6 +39,10 @@ {{ $ts.proxyAccount }} {{ $ts.other }} + + + {{ $ts.database }} +
@@ -229,7 +233,7 @@ export default defineComponent({ .lxpfedzu { padding: 16px; - > img { + > .icon { display: block; margin: auto; height: 42px; diff --git a/src/client/pages/settings/accounts.vue b/src/client/pages/settings/accounts.vue new file mode 100644 index 0000000000..a3fa0d4eb0 --- /dev/null +++ b/src/client/pages/settings/accounts.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/client/pages/settings/index.vue b/src/client/pages/settings/index.vue index ba4fc40ae7..049e912898 100644 --- a/src/client/pages/settings/index.vue +++ b/src/client/pages/settings/index.vue @@ -2,6 +2,14 @@
+ +
+
+ +
+
+ {{ $ts.accounts }} + {{ $ts.profile }} @@ -87,6 +95,7 @@ export default defineComponent({ const component = computed(() => { if (page.value == null) return null; switch (page.value) { + case 'accounts': return defineAsyncComponent(() => import('./accounts.vue')); case 'profile': return defineAsyncComponent(() => import('./profile.vue')); case 'privacy': return defineAsyncComponent(() => import('./privacy.vue')); case 'reaction': return defineAsyncComponent(() => import('./reaction.vue')); @@ -209,4 +218,15 @@ export default defineComponent({ } } } + +.lwjxoukj { + padding: 16px; + + > .avatar { + display: block; + margin: auto; + width: 42px; + height: 42px; + } +} diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue index 45b1c079bd..df11877147 100644 --- a/src/client/ui/_common_/sidebar.vue +++ b/src/client/ui/_common_/sidebar.vue @@ -157,11 +157,11 @@ export default defineComponent({ avatar: this.$i, }, null, ...accountItemPromises, { icon: 'fas fa-plus', - text: this.$ts.addAcount, + text: this.$ts.addAccount, action: () => { os.modalMenu([{ - text: this.$ts.existingAcount, - action: () => { this.addAcount(); }, + text: this.$ts.existingAccount, + action: () => { this.addAccount(); }, }, { text: this.$ts.createAccount, action: () => { this.createAccount(); }, @@ -177,7 +177,7 @@ export default defineComponent({ }, 'closed'); }, - addAcount() { + addAccount() { os.popup(import('@client/components/signin-dialog.vue'), {}, { done: res => { addAccount(res.id, res.i); diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue index 29ef99fc86..b07914679d 100644 --- a/src/client/ui/default.sidebar.vue +++ b/src/client/ui/default.sidebar.vue @@ -141,11 +141,11 @@ export default defineComponent({ avatar: this.$i, }, null, ...accountItemPromises, { icon: 'fas fa-plus', - text: this.$ts.addAcount, + text: this.$ts.addAccount, action: () => { os.modalMenu([{ - text: this.$ts.existingAcount, - action: () => { this.addAcount(); }, + text: this.$ts.existingAccount, + action: () => { this.addAccount(); }, }, { text: this.$ts.createAccount, action: () => { this.createAccount(); }, @@ -161,7 +161,7 @@ export default defineComponent({ }, 'closed'); }, - addAcount() { + addAccount() { os.popup(import('@client/components/signin-dialog.vue'), {}, { done: res => { addAccount(res.id, res.i); From bc074abebaacbe8079f339a99e0d8ce5424f345d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 13:04:04 +0900 Subject: [PATCH 08/15] Update ja-JP.yml --- locales/ja-JP.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d20d720949..90b9a40d96 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -737,6 +737,7 @@ quickAction: "クイックアクション" user: "ユーザー" administration: "管理" accounts: "アカウント" +switch: "切り替え" _email: _follow: From e1e5283963e7ac11856f3348f05ffceacaef5208 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 14:43:40 +0900 Subject: [PATCH 09/15] Improve usability --- locales/ja-JP.yml | 3 +++ src/client/pages/instance/overview.vue | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 90b9a40d96..3824d437fe 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -738,6 +738,9 @@ user: "ユーザー" administration: "管理" accounts: "アカウント" switch: "切り替え" +noMaintainerInformationWarning: "管理者情報が設定されていません。" +noBotProtectionWarning: "Bot防御が設定されていません。" +configure: "設定する" _email: _follow: diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/instance/overview.vue index 651ace08f9..dca2529e1b 100644 --- a/src/client/pages/instance/overview.vue +++ b/src/client/pages/instance/overview.vue @@ -1,6 +1,9 @@