Merge branch 'develop'

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations follow.md (French)

* New translations deck.md (French)

* New translations deck.md (French)

* New translations mute.md (French)

* New translations mute.md (French)

* New translations mute.md (French)

* New translations reaction.md (French)

* New translations reaction.md (French)

* New translations reaction.md (French)

* New translations ja-JP.yml (French)

* New translations custom-emoji.md (French)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations mfm.md (Korean)

* New translations ja-JP.yml (Korean)

* New translations keyboard-shortcut.md (Korean)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations theme.md (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations aiscript.md (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations pages.md (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

.github/workflows/docker.yml

@@ -1,18 +0,0 @@
-name: Docker build
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Pull previous build result (for cache)
-      run: docker pull misskey/misskey:latest
-    - name: Build docker container
-      run: docker build --cache-from misskey/misskey:latest -t misskey/misskey .

.node-version

@@ -1 +1 @@
-v14.15.1
+v14.15.5

CONTRIBUTING.md

@@ -240,36 +240,6 @@ SQLでは配列のインデックスは**1始まり**。
 MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
 
-### 簡素な`undefined`チェック
-データベースからレコードを取得するときに、プログラムの流れ的に(ほぼ)絶対`undefined`にはならない場合でも、`undefined`チェックしないとTypeScriptに怒られます。
-でもいちいち複数行を費やして、発生するはずのない`undefined`をチェックするのも面倒なので、`ensure`というユーティリティ関数を用意しています。
-例えば、
-``` ts
-const user = await Users.findOne(userId);
-// この時点で user の型は User | undefined
-if (user == null) {
-	throw 'missing user';
-}
-// この時点で user の型は User
-```
-という処理を`ensure`を使うと
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// この時点で user の型は User
-```
-という風に書けます。
-もちろん`ensure`内部でエラーを握りつぶすようなことはしておらず、万が一`undefined`だった場合はPromiseがRejectされ後続の処理は実行されません。
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// 万が一 Users.findOne の結果が undefined だったら、ensure でエラーが発生するので
-// この行に到達することは無い
-// なので、.then(ensure) は
-// if (user == null) {
-//	throw 'missing user';
-// }
-// の糖衣構文のような扱いです
-```
-
 ### Migration作成方法
 ```
 npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.15.1-alpine AS base
+FROM node:14.15.5-alpine3.13 AS base
 
 ENV NODE_ENV=production
 
@@ -10,7 +10,6 @@ RUN apk add --no-cache \
     autoconf \
     automake \
     file \
-		git \
     g++ \
     gcc \
     libc-dev \
@@ -18,8 +17,10 @@ RUN apk add --no-cache \
     make \
     nasm \
     pkgconfig \
-    python \
-    zlib-dev
+    python3 \
+    zlib-dev \
+    vips-dev \
+    vips
 
 COPY package.json yarn.lock ./
 RUN yarn install
@@ -30,8 +31,9 @@ FROM base AS runner
 
 RUN apk add --no-cache \
     ffmpeg \
-    tini
-RUN npm i -g web-push
+    tini \
+    vips
+
 ENTRYPOINT ["/sbin/tini", "--"]
 
 COPY --from=builder /misskey/node_modules ./node_modules

README.md

@@ -1,7 +1,8 @@
-<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/)
 
-[![Misskey](/assets/title.png)](https://join.misskey.page/)
-================================================================
+<h1 align="center">Misskey</h1>
+
+<div align="center">
 
 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
 [![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
@@ -10,69 +11,52 @@
 
 **A forever evolving, interplanetary microblogging platform.**
 
-<p align="justify">
 <a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
 Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>
-</p>
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
+</div>
+
+---
+
 ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
 
 :sparkles: Features
 ----------------------------------------------------------------
+<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
-<img src="/assets/about/post.png" align="left" height="200px"/>
-
-<h3 align="left">Posting</h3>
-<p align="justify">
+<h3>Posting</h3>
+<p>
 Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
 </p>
 
 ---
 
-<img src="/assets/about/reaction.png" align="right" height="200px"/>
-
-<h3 align="right">Reactions</h3>
-<p align="justify">
+<h3 >Reactions</h3>
+<p>
 Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
 </p>
 
 ---
 
-<img src="/assets/about/ui.png" align="left" height="200px"/>
-
-<h3 align="left">Interface</h3>
-<p align="justify">
+<h3>Interface</h3>
+<p>
 Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
 </p>
 
 ---
 
-<img src="/assets/about/drive.png" align="right" width="300px"/>
-
-<h3 align="right">Misskey Drive</h3>
-<p align="justify">
+<h3>Misskey Drive</h3>
+<p>
 Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
 </p>
 
 ---
 
-...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
-
-Screen shots
-----------------------------------------------------------------
-### Profile page
-<img src="/assets/ss/user.jpg" width="500px"/>
-
-### Explore users
-<img src="/assets/ss/explore.jpg" width="500px"/>
-
-:new: What's new
-----------------------------------------------------------------
-Please see the [Release notes](./CHANGELOG.md).
+...and more!
 
 :package: Create your own instance
 ----------------------------------------------------------------
@@ -106,6 +90,10 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 	</tr>
 </table>
 
+---
+
+To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse.
+
 :heart: Backers
 ----------------------------------------------------------------
 <!-- PATREON_START -->

assets/client/manifest.json

@@ -7,12 +7,12 @@
 	"theme_color": "#86b300",
 	"icons": [
 		{
-			"src": "/assets/icons/192.png",
+			"src": "/static-assets/icons/192.png",
 			"sizes": "192x192",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icons/512.png",
+			"src": "/static-assets/icons/512.png",
 			"sizes": "512x512",
 			"type": "image/png"
 		}