Merge branch 'develop'

4 files changed, 33 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a77218c7..8354d72ba6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
 You should also include the user name that made the change.
 -->
 
+## 12.112.2 (2022/07/08)
+
+### 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
 
@@ -21,6 +27,10 @@ same as 12.112.0
 - ハイライトがみつけるに統合されました
 - カスタム絵文字ページはインスタンス情報ページに統合されました
 - 連合ページはインスタンス情報ページに統合されました
+- メンション一覧ページは通知一覧ページに統合されました
+- ダイレクト投稿一覧ページは通知一覧ページに統合されました
+- メニューからアンテナタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました
+- メニューからリストタイムラインを表示する方法は廃止され、タイムライン上部のアイコンからアクセスするようになりました
 
 ### Improvements
 - Server: Allow GET method for some endpoints @syuilo
@@ -28,6 +38,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
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"]
-
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",
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',