From 86847f186647dee598fbc5aa1cb90dc1d52269e8 Mon Sep 17 00:00:00 2001 From: nullnyat Date: Sat, 12 Feb 2022 17:48:24 +0900 Subject: [PATCH] =?UTF-8?q?12.107.0=E3=81=AB=E3=81=82=E3=81=A3=E3=81=B7?= =?UTF-8?q?=E3=81=A0=E3=81=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 11 ++++++++++ locales/de-DE.yml | 2 ++ locales/en-US.yml | 2 ++ locales/sk-SK.yml | 2 ++ package.json | 2 +- .../backend/src/server/api/endpoints/stats.ts | 6 +++--- packages/client/src/components/ui/tooltip.vue | 12 +++++------ packages/client/src/init.ts | 3 +-- .../client/src/scripts/check-word-mute.ts | 6 +++++- packages/client/src/scripts/theme.ts | 2 ++ packages/client/src/themes/d-cherry.json5 | 20 ++++++++++++++++++ packages/client/src/themes/l-cherry.json5 | 21 +++++++++++++++++++ packages/client/src/ui/_common_/sidebar.vue | 2 +- packages/client/src/ui/deck.vue | 2 +- packages/client/src/ui/universal.vue | 5 +++-- 15 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 packages/client/src/themes/d-cherry.json5 create mode 100644 packages/client/src/themes/l-cherry.json5 diff --git a/CHANGELOG.md b/CHANGELOG.md index bed70f918..89f070909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,17 @@ You should also include the user name that made the change. --> +## 12.107.0 (2022/02/12) + +### Improvements +- クライアント: テーマを追加 @syuilo + +### Bugfixes +- API: stats APIで内部エラーが発生する問題を修正 @syuilo +- クライアント: ソフトミュートですべてがマッチしてしまう場合があるのを修正 @tamaina +- クライアント: デバイスのスクリーンのセーフエリアを考慮するように @syuilo +- クライアント: 一部環境でサイドバーの投稿ボタンが表示されない問題を修正 @syuilo + ## 12.106.3 (2022/02/11) ### Improvements diff --git a/locales/de-DE.yml b/locales/de-DE.yml index bd93e5301..c5bf40740 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -831,6 +831,8 @@ smartphone: "Smartphone" tablet: "Tablet" auto: "Automatisch" themeColor: "Instanzfarbe" +size: "Größe" +numberOfColumn: "Spaltenanzahl" _emailUnavailable: used: "Diese Email-Adresse wird bereits verwendet" format: "Das Format dieser Email-Adresse ist ungültig" diff --git a/locales/en-US.yml b/locales/en-US.yml index ea70da793..12aea3385 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -831,6 +831,8 @@ smartphone: "Smartphone" tablet: "Tablet" auto: "Auto" themeColor: "Theme Color" +size: "Size" +numberOfColumn: "Number of columns" _emailUnavailable: used: "This email address is already being used" format: "The format of this email address is invalid" diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 643770ca3..a501591a8 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -830,6 +830,8 @@ smartphone: "Smartfón" tablet: "Tablet" auto: "Automaticky" themeColor: "Farba témy" +size: "Veľkosť" +numberOfColumn: "Počet stĺpcov" _emailUnavailable: used: "Táto emailová adresa sa už používa" format: "Formát emailovej adresy je nesprávny" diff --git a/package.json b/package.json index c4c48579d..970b871ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.106.3-nca10.net-v1", + "version": "12.107.0-nca10.net-v1", "codename": "indigo", "repository": { "type": "git", diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts index 17281888a..82b0bb329 100644 --- a/packages/backend/src/server/api/endpoints/stats.ts +++ b/packages/backend/src/server/api/endpoints/stats.ts @@ -1,6 +1,6 @@ import define from '../define'; -import { NoteReactions, Notes, Users } from '@/models/index'; -import { federationChart, driveChart } from '@/services/chart/index'; +import { Instances, NoteReactions, Notes, Users } from '@/models/index'; +import { } from '@/services/chart/index'; export const meta = { requireCredential: false, @@ -63,7 +63,7 @@ export default define(meta, async () => { Users.count({ where: { host: null }, cache: 3600000 }), NoteReactions.count({ cache: 3600000 }), // 1 hour //NoteReactions.count({ where: { userHost: null }, cache: 3600000 }), - federationChart.getChart('hour', 1, null).then(chart => chart.instance.total[0]), + Instances.count({ cache: 3600000 }), ]); return { diff --git a/packages/client/src/components/ui/tooltip.vue b/packages/client/src/components/ui/tooltip.vue index 3ccd1b731..ee1909554 100644 --- a/packages/client/src/components/ui/tooltip.vue +++ b/packages/client/src/components/ui/tooltip.vue @@ -180,12 +180,12 @@ const setPosition = () => { el.value.style.top = top + 'px'; }; +let loopHandler; + onMounted(() => { nextTick(() => { setPosition(); - let loopHandler; - const loop = () => { loopHandler = window.requestAnimationFrame(() => { setPosition(); @@ -194,12 +194,12 @@ onMounted(() => { }; loop(); - - onUnmounted(() => { - window.cancelAnimationFrame(loopHandler); - }); }); }); + +onUnmounted(() => { + window.cancelAnimationFrame(loopHandler); +});