From 7cf32180684467b50d5d516c4120f5bcd8224026 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 17:28:13 +0900 Subject: [PATCH 01/24] chore(client): tweak ui --- packages/client/src/menu.ts | 43 ++----------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/packages/client/src/menu.ts b/packages/client/src/menu.ts index 503924e64b..31b2ed597c 100644 --- a/packages/client/src/menu.ts +++ b/packages/client/src/menu.ts @@ -1,6 +1,5 @@ import { computed, ref, reactive } from 'vue'; import { $i } from './account'; -import { mainRouter } from '@/router'; import { search } from '@/scripts/search'; import * as os from '@/os'; import { i18n } from '@/i18n'; @@ -55,26 +54,7 @@ export const menuDef = reactive({ title: 'lists', icon: 'fas fa-list-ul', show: computed(() => $i != null), - active: computed(() => mainRouter.currentRoute.value.path.startsWith('/timeline/list/') || mainRouter.currentRoute.value.path === '/my/lists' || mainRouter.currentRoute.value.path.startsWith('/my/lists/')), - action: (ev) => { - const items = ref([{ - type: 'pending', - }]); - os.api('users/lists/list').then(lists => { - const _items = [...lists.map(list => ({ - type: 'link', - text: list.name, - to: `/timeline/list/${list.id}`, - })), null, { - type: 'link', - to: '/my/lists', - text: i18n.ts.manageLists, - icon: 'fas fa-cog', - }]; - items.value = _items; - }); - os.popupMenu(items, ev.currentTarget ?? ev.target); - }, + to: '/my/lists', }, /* groups: { @@ -88,26 +68,7 @@ export const menuDef = reactive({ title: 'antennas', icon: 'fas fa-satellite', show: computed(() => $i != null), - active: computed(() => mainRouter.currentRoute.value.path.startsWith('/timeline/antenna/') || mainRouter.currentRoute.value.path === '/my/antennas' || mainRouter.currentRoute.value.path.startsWith('/my/antennas/')), - action: (ev) => { - const items = ref([{ - type: 'pending', - }]); - os.api('antennas/list').then(antennas => { - const _items = [...antennas.map(antenna => ({ - type: 'link', - text: antenna.name, - to: `/timeline/antenna/${antenna.id}`, - })), null, { - type: 'link', - to: '/my/antennas', - text: i18n.ts.manageAntennas, - icon: 'fas fa-cog', - }]; - items.value = _items; - }); - os.popupMenu(items, ev.currentTarget ?? ev.target); - }, + to: '/my/antennas', }, favorites: { title: 'favorites', From 1c5f339d094cc44d2bd0a86ad2120cf9e37a5b76 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 17:28:21 +0900 Subject: [PATCH 02/24] chore(client): tweak style --- packages/client/src/ui/_common_/statusbar-federation.vue | 2 +- packages/client/src/ui/_common_/statusbar-rss.vue | 2 +- packages/client/src/ui/_common_/statusbar-user-list.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/ui/_common_/statusbar-federation.vue b/packages/client/src/ui/_common_/statusbar-federation.vue index 87b954b900..7cf6b1f973 100644 --- a/packages/client/src/ui/_common_/statusbar-federation.vue +++ b/packages/client/src/ui/_common_/statusbar-federation.vue @@ -80,7 +80,7 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), { ::v-deep(.item) { display: inline-block; vertical-align: bottom; - margin-right: 3em; + margin-right: 5em; > .icon { display: inline-block; diff --git a/packages/client/src/ui/_common_/statusbar-rss.vue b/packages/client/src/ui/_common_/statusbar-rss.vue index 83e78a376a..88604a38a7 100644 --- a/packages/client/src/ui/_common_/statusbar-rss.vue +++ b/packages/client/src/ui/_common_/statusbar-rss.vue @@ -79,7 +79,7 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), { display: inline-block; width: 0.5px; height: var(--height); - margin: 0 2em; + margin: 0 3em; background: currentColor; opacity: 0.3; } diff --git a/packages/client/src/ui/_common_/statusbar-user-list.vue b/packages/client/src/ui/_common_/statusbar-user-list.vue index 12533d05f6..490c8a096e 100644 --- a/packages/client/src/ui/_common_/statusbar-user-list.vue +++ b/packages/client/src/ui/_common_/statusbar-user-list.vue @@ -104,7 +104,7 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), { display: inline-block; width: 0.5px; height: 16px; - margin: 0 2em; + margin: 0 3em; background: currentColor; opacity: 0; } From f4fcb912e3d0f14a987f4e1a1b2fb0116d9c3b3f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 17:29:30 +0900 Subject: [PATCH 03/24] enhance(client): make widgets available on tablet again --- CHANGELOG.md | 1 + packages/client/src/ui/universal.vue | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44ac75b66..1046a1046d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ You should also include the user name that made the change. - Client: Word mute also checks content warnings @Johann150 - Client: メニューからページをリロードできるように @syuilo - Client: Improve emoji picker performance @syuilo +- Client: Make widgets available again on a tablet @syuilo - ユーザーにモデレーションメモを残せる機能 @syuilo - Make possible to delete an account by admin @syuilo - Improve player detection in URL preview @mei23 diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 8c48510a44..2edfb3f12d 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -16,7 +16,7 @@ - +
@@ -249,7 +249,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null; } } -/* > .widgetButton { display: block; position: fixed; @@ -262,18 +261,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null; box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12); font-size: 22px; background: var(--panel); - - &.navHidden { - display: none; - } - - @media (min-width: ($widgets-hide-threshold + 1px)) { - display: none; - } - }*/ - - > .widgetButton { - display: none; } > .widgetsDrawer-back { From a23f59b996de5f8a47614dd99ce2b7a319b3fad4 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Thu, 7 Jul 2022 01:35:56 -0700 Subject: [PATCH 04/24] enhance: Styled error screen (#8946) * Styled error screen * Make details margin auto * Update boot.css * Replace fontawesome with tabler svg * Remove hr * Add new style to flush screen * Rename to `error.css` * Fix * Update base.pug * Finally fix! * Wrap details in `` * Add style to flush * Fix * BIOS -> Repair tool * Fix * Typo * Adjust style * Adjust text * Flush -> Clear * Revert flush changes * Responsive * Also hide splash --- packages/backend/src/server/web/boot.js | 166 ++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 13 deletions(-) diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index 9fc536555a..0a5cc0e0dc 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -102,29 +102,169 @@ document.head.appendChild(style); } - // eslint-disable-next-line no-inner-declarations + async function addStyle(styleText) { + let css = document.createElement('style'); + css.appendChild(document.createTextNode(styleText)); + document.head.appendChild(css); + } + function renderError(code, details) { let errorsElement = document.getElementById('errors'); + if (!errorsElement) { document.documentElement.innerHTML = ` -

⚠ An error has occurred. ⚠

-

If the problem persists, please contact the administrator. You may also try the following options:

- -
+ + + + + +

An error has occurred!

+ +

Don't worry, it's (probably) not your fault.

+

If the problem persists after refreshing, please contact your instance's administrator.
You may also try the following options:

+ + + +
+ + + +
+ + + +
`; - errorsElement = document.getElementById('errors'); } - const detailsElement = document.createElement('details'); - detailsElement.innerHTML = `ERROR CODE: ${code}${JSON.stringify(details)}`; - + detailsElement.innerHTML = ` +
+ + ERROR CODE: ${code} + + ${JSON.stringify(details)}`; errorsElement.appendChild(detailsElement); + addStyle(` + * { + font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; + } + + #misskey_app, + #splash { + display: none !important; + } + + body, + html { + background-color: #222; + color: #dfddcc; + justify-content: center; + margin: auto; + padding: 10px; + text-align: center; + } + + button { + border-radius: 999px; + padding: 0px 12px 0px 12px; + border: none; + cursor: pointer; + margin-bottom: 12px; + } + + .button-big { + background: linear-gradient(90deg, rgb(134, 179, 0), rgb(74, 179, 0)); + line-height: 50px; + } + + .button-big:hover { + background: rgb(153, 204, 0); + } + + .button-small { + background: #444; + line-height: 40px; + } + + .button-small:hover { + background: #555; + } + + .button-label-big { + color: #222; + font-weight: bold; + font-size: 20px; + padding: 12px; + } + + .button-label-small { + color: rgb(153, 204, 0); + font-size: 16px; + padding: 12px; + } + + a { + color: rgb(134, 179, 0); + text-decoration: none; + } + + p, + li { + font-size: 16px; + } + + .dont-worry, + #msg { + font-size: 18px; + } + + .icon-warning { + color: #dec340; + height: 4rem; + padding-top: 2rem; + } + + h1 { + font-size: 32px; + } + + code { + font-family: Fira, FiraCode, monospace; + } + + details { + background: #333; + margin-bottom: 2rem; + padding: 0.5rem 1rem; + width: 40rem; + border-radius: 10px; + justify-content: center; + margin: auto; + } + + summary { + cursor: pointer; + } + + summary > * { + display: inline; + } + + @media screen and (max-width: 500px) { + details { + width: 50%; + } + `) } // eslint-disable-next-line no-inner-declarations From 9426f37c3e398904390440a3948d93f8a90cc05f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 17:55:47 +0900 Subject: [PATCH 05/24] chore(client): tweak ui --- packages/client/src/components/instance-stats.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/instance-stats.vue b/packages/client/src/components/instance-stats.vue index a2a6353923..1a811c2d87 100644 --- a/packages/client/src/components/instance-stats.vue +++ b/packages/client/src/components/instance-stats.vue @@ -154,7 +154,7 @@ function createDoughnut(chartEl, tooltip, data) { } onMounted(() => { - os.apiGet('federation/stats', { limit: 20 }).then(fedStats => { + os.apiGet('federation/stats', { limit: 30 }).then(fedStats => { createDoughnut(subDoughnutEl, externalTooltipHandler1, fedStats.topSubInstances.map(x => ({ name: x.host, color: x.themeColor, From a279d502120533bab95b93dd4e80187f8c30fd34 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 18:06:34 +0900 Subject: [PATCH 06/24] chore(client): tweak ui --- packages/client/src/pages/instance-info.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index b97ebb3e3d..d4d338b125 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -28,7 +28,7 @@ {{ $ts.stopActivityDelivery }} {{ $ts.blockThisInstance }} - Refresh metadata + Refresh metadata @@ -56,8 +56,12 @@ - - + + + + + + From 423e7692db78f369eeaae7be6d89c6957f209d9b Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 18:09:50 +0900 Subject: [PATCH 07/24] chore(server): tweak api for admin --- packages/backend/src/server/api/endpoints/admin/show-users.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index 1575d81d5d..9c141e3bf8 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -61,7 +61,7 @@ export default define(meta, paramDef, async (ps, me) => { } if (ps.hostname) { - query.andWhere('user.host like :hostname', { hostname: '%' + ps.hostname.toLowerCase() + '%' }); + query.andWhere('user.host = :hostname', { hostname: ps.hostname.toLowerCase() }); } switch (ps.sort) { From 3ffe674e80dc33e13c39ec83daf1954ade2ec46d Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 18:28:43 +0900 Subject: [PATCH 08/24] update deps --- packages/client/package.json | 4 ++-- packages/client/yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index a84e9b9b70..f65e70870e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -15,7 +15,7 @@ "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", "@syuilo/aiscript": "0.11.1", - "@vitejs/plugin-vue": "3.0.0-beta.0", + "@vitejs/plugin-vue": "3.0.0-beta.1", "@vue/compiler-sfc": "3.2.37", "abort-controller": "3.0.0", "autobind-decorator": "2.4.0", @@ -74,7 +74,7 @@ "uuid": "8.3.2", "v-debounce": "0.1.2", "vanilla-tilt": "1.7.2", - "vite": "3.0.0-beta.6", + "vite": "3.0.0-beta.7", "vue": "3.2.37", "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "4.0.1", diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock index 3c77a94a29..e5459b8dda 100644 --- a/packages/client/yarn.lock +++ b/packages/client/yarn.lock @@ -600,10 +600,10 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@vitejs/plugin-vue@3.0.0-beta.0": - version "3.0.0-beta.0" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0-beta.0.tgz#092f4f50ee183818e252331833541dbdcae1b91d" - integrity sha512-t8os1QK1qpovpgYAJSOWYEu+Doy/DZRW1cNwMvUl0qo+Yv7D9a3cxo24oL01lbojcc9ABQhyvUP3BsvFNtriqg== +"@vitejs/plugin-vue@3.0.0-beta.1": + version "3.0.0-beta.1" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0-beta.1.tgz#65a6be6ed619955a5edea6115dedcfc5da4ed3f6" + integrity sha512-cPVQHIKZkVEQ8qW7+BlbTrGJXNpP2aMKzVhQdTnWK9u6cSDmVdZOXHmKPO2KVvrNpFXXS8R7hHBXMsSApA+XOA== "@vue/compiler-core@3.2.37": version "3.2.37" @@ -4215,10 +4215,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@3.0.0-beta.6: - version "3.0.0-beta.6" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.0-beta.6.tgz#dd54c304ce7ceca243be8a114f28c431bbc447a1" - integrity sha512-jAxxCGXs6oIO3dFh7gwDEP9RqFzYY+ULDWawS1dd3HfM4FCr8rkOnLljDoBBIDdTNM8M7pDzdoYSmpPEOJqyZQ== +vite@3.0.0-beta.7: + version "3.0.0-beta.7" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.0-beta.7.tgz#ded6483ef3b9b16dbe3a912a35accb9cc3498530" + integrity sha512-yjw154hB229qq5Bl6+/CJSTxC/yIDmDJbaAjE/pdracz3jytNEd2ovk5BvxgZT6+qPiUc2rRH3FgGqiZnweIFw== dependencies: esbuild "^0.14.47" postcss "^8.4.14" From 95b966474f88f74224a712388bbfa4113a0d11b2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 18:28:54 +0900 Subject: [PATCH 09/24] 12.112.0-beta.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ccdfa727fd..199dffce6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.112.0-beta.20", + "version": "12.112.0-beta.21", "codename": "indigo", "repository": { "type": "git", From 10f7e976ee92b501e53b22151816e772ed635417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 18:29:42 +0900 Subject: [PATCH 10/24] chore(deps): bump moment from 2.29.3 to 2.29.4 in /packages/backend (#8958) Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/backend/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock index 3c9f2680f5..32f6a402d4 100644 --- a/packages/backend/yarn.lock +++ b/packages/backend/yarn.lock @@ -4731,9 +4731,9 @@ mocha@10.0.0: yargs-unparser "2.0.0" moment@^2.22.2: - version "2.29.3" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" - integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== ms@2.0.0: version "2.0.0" From da239b8362038374dcd21b4c85d31880d144cd89 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 19:08:18 +0900 Subject: [PATCH 11/24] chore(server): tweak api for admin --- packages/backend/src/server/api/endpoints/admin/show-users.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index 9c141e3bf8..8e09e72d5b 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -25,7 +25,7 @@ export const paramDef = { offset: { type: 'integer', default: 0 }, sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] }, state: { type: 'string', enum: ['all', 'alive', 'available', 'admin', 'moderator', 'adminOrModerator', 'silenced', 'suspended'], default: 'all' }, - origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' }, + origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' }, username: { type: 'string', nullable: true, default: null }, hostname: { type: 'string', From c0eba655274c195f809438c2e23f95b4c3f87691 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 20:19:50 +0900 Subject: [PATCH 12/24] chore(client): tweak ui --- packages/client/src/pages/follow-requests.vue | 57 ++++++++++--------- .../client/src/ui/_common_/statusbars.vue | 4 ++ .../client/src/widgets/instance-cloud.vue | 2 +- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue index f21c68c4c7..1f4dc9e938 100644 --- a/packages/client/src/pages/follow-requests.vue +++ b/packages/client/src/pages/follow-requests.vue @@ -1,34 +1,37 @@ + + From 0890253b4c56a578e83c320e922058d5659aa1a7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 21:21:36 +0900 Subject: [PATCH 17/24] 12.112.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b2ffe4805..61cef08a6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) +## 12.112.0 (2022/07/07) ### Known issues - 現在arm64環境ではインストールに失敗します。これは次のバージョンで修正される予定です。 diff --git a/package.json b/package.json index 199dffce6f..e8b648b0a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.112.0-beta.21", + "version": "12.112.0", "codename": "indigo", "repository": { "type": "git", From 4bff55231fb89a25dd61153bf70fd889967f45ba Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 7 Jul 2022 21:22:43 +0900 Subject: [PATCH 18/24] 12.112.1 --- CHANGELOG.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61cef08a6d..63a77218c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ You should also include the user name that made the change. --> +## 12.112.1 (2022/07/07) +same as 12.112.0 + ## 12.112.0 (2022/07/07) ### Known issues diff --git a/package.json b/package.json index e8b648b0a4..549308a892 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.112.0", + "version": "12.112.1", "codename": "indigo", "repository": { "type": "git", From 207d7e04783cc20bfe26fbb8aed83be2ade6f797 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jul 2022 11:21:11 +0900 Subject: [PATCH 19/24] fix test --- packages/backend/test/get-file-info.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/backend/test/get-file-info.ts b/packages/backend/test/get-file-info.ts index 6ceeb352af..09378fec88 100644 --- a/packages/backend/test/get-file-info.ts +++ b/packages/backend/test/get-file-info.ts @@ -14,6 +14,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 0, md5: 'd41d8cd98f00b204e9800998ecf8427e', @@ -33,6 +34,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 25360, md5: '091b3f259662aa31e2ffef4519951168', @@ -52,6 +54,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 1868, md5: '08189c607bea3b952704676bb3c979e0', @@ -71,6 +74,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 2248, md5: '32c47a11555675d9267aee1a86571e7e', @@ -90,6 +94,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 3772, md5: 'f73535c3e1e27508885b69b10cf6e991', @@ -109,6 +114,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 505, md5: 'b6f52b4b021e7b92cdd04509c7267965', @@ -129,6 +135,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 544, md5: '4b7a346cde9ccbeb267e812567e33397', @@ -148,6 +155,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 75933, md5: '268c5dde99e17cf8fe09f1ab3f97df56', @@ -167,6 +175,7 @@ describe('Get file info', () => { delete info.warnings; delete info.blurhash; delete info.sensitive; + delete info.porn; assert.deepStrictEqual(info, { size: 12624, md5: '68d5b2d8d1d1acbbce99203e3ec3857e', From 9a58b4160bba25e84178defd902b58ba68d95ccb Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jul 2022 11:21:14 +0900 Subject: [PATCH 20/24] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a77218c7..cdcf189c6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ same as 12.112.0 - ハイライトがみつけるに統合されました - カスタム絵文字ページはインスタンス情報ページに統合されました - 連合ページはインスタンス情報ページに統合されました +- メニューからアンテナタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました +- メニューからリストタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました ### Improvements - Server: Allow GET method for some endpoints @syuilo From 3b71f985a51b9b47dc11fd95bb1a582fe5aa109b Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jul 2022 11:24:12 +0900 Subject: [PATCH 21/24] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdcf189c6a..e9cd6f467b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ same as 12.112.0 - ハイライトがみつけるに統合されました - カスタム絵文字ページはインスタンス情報ページに統合されました - 連合ページはインスタンス情報ページに統合されました +- メンション一覧ページは通知一覧ページに統合されました +- ダイレクト投稿一覧ページは通知一覧ページに統合されました - メニューからアンテナタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました - メニューからリストタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました From 481783606f6c7d702faa251a5c85994db26a0a27 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jul 2022 11:27:49 +0900 Subject: [PATCH 22/24] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9cd6f467b..93cbc10b74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ same as 12.112.0 - Server: Add rate limit to i/notifications @tamaina - Client: Improve control panel @syuilo - Client: Show warning in control panel when there is an unresolved abuse report @syuilo +- Client: Statusbars @syuilo - Client: Add instance-cloud widget @syuilo - Client: Add rss-ticker widget @syuilo - Client: Removing entries from a clip @futchitwo From 417e75b470628e43623370c4c4d1d5849a3adfef Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 8 Jul 2022 17:17:21 +0900 Subject: [PATCH 23/24] =?UTF-8?q?Docker=E3=81=A7Alpine=E3=81=A7=E3=81=AF?= =?UTF-8?q?=E3=81=AA=E3=81=8FDebian=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#8966)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Debian * CHANGELOG * Update CHANGELOG --- CHANGELOG.md | 8 ++++++++ Dockerfile | 28 ++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93cbc10b74..db229f539a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements + +### Bugfixes +- Fix Docker doesn't work @mei23 + Still not working on arm64 environment. (See 12.112.0) + ## 12.112.1 (2022/07/07) same as 12.112.0 diff --git a/Dockerfile b/Dockerfile index 33d5faad12..81dc726375 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,24 @@ -FROM node:18.0.0-alpine3.15 AS base +FROM node:16.15.1-bullseye AS builder ARG NODE_ENV=production WORKDIR /misskey -ENV BUILD_DEPS autoconf automake file g++ gcc libc-dev libtool make nasm pkgconfig python3 zlib-dev git - -FROM base AS builder - COPY . ./ -RUN apk add --no-cache $BUILD_DEPS && \ - git submodule update --init && \ - yarn install && \ - yarn build && \ - rm -rf .git +RUN apt-get update +RUN apt-get install -y build-essential +RUN git submodule update --init +RUN yarn install +RUN yarn build +RUN rm -rf .git -FROM base AS runner +FROM node:16.15.1-bullseye-slim AS runner -RUN apk add --no-cache \ - ffmpeg \ - tini +WORKDIR /misskey -ENTRYPOINT ["/sbin/tini", "--"] +RUN apt-get update +RUN apt-get install -y ffmpeg tini COPY --from=builder /misskey/node_modules ./node_modules COPY --from=builder /misskey/built ./built @@ -32,5 +28,5 @@ COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node COPY . ./ ENV NODE_ENV=production +ENTRYPOINT ["/usr/bin/tini", "--"] CMD ["npm", "run", "migrateandstart"] - From 4ac75243e5a567ef3b7e2f1b068429648b86c24f Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jul 2022 17:34:44 +0900 Subject: [PATCH 24/24] 12.112.2 --- CHANGELOG.md | 4 +--- package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db229f539a..8354d72ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,7 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) - -### Improvements +## 12.112.2 (2022/07/08) ### Bugfixes - Fix Docker doesn't work @mei23 diff --git a/package.json b/package.json index 549308a892..e07da5ca0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.112.1", + "version": "12.112.2", "codename": "indigo", "repository": { "type": "git",