developブランチマージ

fix doc
update dockerfile
2019-10-19 04:43:08 +09:00 · 2019-07-19 00:50:54 +09:00 · 2019-07-19 00:49:06 +09:00 · 2019-07-19 00:41:10 +09:00 · 2019-07-19 00:36:07 +09:00 · 2019-07-18 20:37:17 +09:00
406 changed files with 9295 additions and 3285 deletions
--- a/.config/example.yml
+++ b/.config/example.yml
@ -116,8 +116,25 @@ autoAdmin: true
 # Whether disable HSTS
 #disableHsts: true

-# Clustering
+# Number of worker processes
 #clusterLimit: 1

+# Job concurrency per worker
+# deliverJobConcurrency: 128;
+# inboxJobConcurrency: 16;
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,7 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
+*.mqo -diff -text
+*.glb -diff -text
+*.blend -diff -text
+*.afdesign -diff -text
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 # Visual Studio Code
 /.vscode
+!/.vscode/extensions.json

 # Intelij-IDEA
 /.idea
@ -29,3 +30,10 @@ api-docs.json
 .DS_Store
 /files
 ormconfig.json
+
+# blender backups
+*.blend1
+*.blend2
+*.blend3
+*.blend4
+*.blend5
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-v12.6.0
+v12.11.1
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -2,10 +2,10 @@
 	"recommendations": [
 		"ducksoupdev.vue2",
 		"editorconfig.editorconfig",
-		"eg2.tslint",
 		"eg2.vscode-npm-script",
 		"hollowtree.vue-snippets",
 		"ms-vscode.typescript-javascript-grammar",
+		"ms-vscode.vscode-typescript-tslint-plugin",
 		"octref.vetur",
 		"sysoev.language-stylus"
 	]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,238 @@
 ChangeLog
 =========

+11.34.0 (2019/10/14)
+--------------------
+### ✨Improvements
+* みつけるに連合分を表示するように
+* リアクションピッカーをカスタマイズできるように
+* inputで不正な値を入力したときにメッセージを表示するように
+* ドライブファイルダウンロードURLにdownloadを付けないように
+* web-pushでProxyを使用するように
+
+### 🐛Fixes
+* 投稿本文が合字を含んで8192文字の場合に制限をパスしても投稿できない問題を修正
+* meta.maxNoteTextLengthをnote.textの最大サイズより大きく設定できる問題を修正
+* ページ移動等してもメニュー等が閉じずに残ってしまう問題を修正
+* ページ移動してもメディアビューワーが残ってしまう問題を修正
+* APに関する問題の修正
+* オフライン時に大室櫻子が出てこない問題を修正
+
+11.33.0 (2019/09/27)
+--------------------
+### ✨Improvements
+* 絵文字ピッカーの Unicode 12.0 対応
+* Adminページのユーザー一覧フィルターに利用可能アカウントを追加
+* お知らせウィジェットのデザインを変更
+
+### 🐛Fixes
+* ユーザーを特定のリストから外すと他のリストからも消える問題を修正
+* 任意のグループからユーザーを削除すると他のグループからでも削除されちゃうのを修正
+* 非公開の投稿にリアクションや返信がついたとき通知が正しく行われない問題を修正
+* AP: featured collectionの取り扱いが間違ってるのを修正
+* AP: 存在しないユーザーをAPで参照すると404にするべきところ500になってしまうのを修正
+* AndoridとデスクトップOSのChromeでPWAとしてインストール（ホーム画面に追加）できない問題を修正
+* /@:user/* でユーザー用のページを返さない問題を修正
+* インスタンス設定で空Arrayがうまく保存できない問題を修正
+* 絵文字サジェスト時にそれがサロゲートペアだった場合「1文字」分しかカーソルが移動しない問題を修正
+* ハッシュタグパースの修正
+* MFMでKeycap Number Signが表示できない問題を修正
+* フォローリクエストページのデザインを修正
+* selectコンポーネントに余分な下線が付く問題を修正
+
+11.32.0 (2019/09/10)
+--------------------
+### ✨Improvements
+* APでRenote/Boost取り消しをやりとりするように
+* リモートNote存在確認から作成までの間にLockをかけるように
+* 広告ブロッカーの警告を削除
+
+### 🐛Fixes
+* ミュートしているユーザーからトークメッセージが来たときに通知インジケーターが点灯する問題を修正
+* リアクションした人が10人を超えるときツールチップの表示がおかしい問題を修正
+
+11.31.4 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.3 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.2 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.1 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.0 (2019/09/02)
+--------------------
+### ✨Improvements
+* Syslogサポート
+* チャートの同期機能をAPI経由で使えるように
+* SMTPでProxyを使用できるように
+* リアクションにホバーすることで誰がリアクションしたか見れるように
+* リプライ時、返信元のlocalOnly属性を引き継ぐように
+* 引用付き、ローカルのみなどの案内文にアイコン追加
+* AP deliver/inbox job の並列度を変更できるように
+* clusterLimitの既定値を1に
+* AP inbox ジョブの並列度を下げる
+* CWが付いた投稿はAP上でNote.sensitiveフラグを付けるように
+* メモウィジェットの内容を自動で保存するように
+* ページURLが他と重複してたらエラーを投げるように
+* ページURLが空の時エラーを投げるように
+* リアクションが解除されたときはアニメーションしないように
+* 設定の各セクションごとにURLを割り当てるように
+* 管理画面の各セクションごとにURLを割り当てるように
+
+### 🐛Fixes
+* 未実装のTLのRenoteクエリを実装
+* タイムラインAPIのexcludeNsfwオプションを実装
+* ユーザーページの投稿一覧の私の投稿にRenoteが表示される問題を修正
+* meta APIでemojiプロパティに不要な情報が含まれているのを修正
+* モバイル版でドライブのファイルを削除したときの挙動がおかしい問題を修正
+* visiblity-chooserにlocalOnly属性が伝わらなかったのを修正
+* 言語指定したときコードブロックが表示されない問題を修正
+* トークのメッセージがはみ出す問題を修正
+* CWの中のサムネイルのサイズが変なのを少し修正
+* リアクションが初めて付いた時のエフェクトが消えている問題を修正
+* 無効になっているスイッチを操作できる問題を修正
+* Mキー連打で画面が真っ暗問題を修正
+* AmazonのURLプレビューが出来ない問題を修正
+* 表記ゆれを修正
+
+11.30.0 (2019/08/24)
+--------------------
+### ✨Improvements
+* Room: 家具をすべてしまうボタンを追加
+* Room: カップ麺追加
+* Room: ホログラフィックディスプレイ追加
+* Room: エナジードリンク追加
+* Room: ピンギンの色を変えられるように
+* Room: プレビューの見やすさを向上
+* Room保存時にダイアログを表示するように
+* Roomから移動するときに未保存ならば警告するように
+
+### 🐛Fixes
+* MisskeyRoomからページを戻した時、テキスト入力画面で選択位置変更ができない問題を修正
+
+11.29.0 (2019/08/19)
+--------------------
+### ✨Improvements
+* Room: ソファ追加
+* Room: 螺旋階段追加
+* Room: ゴミ箱追加
+
+### 🐛Fixes
+* Room: 部屋を離れても裏でレンダリングが続く問題を修正
+* Room: アバターのレンダリングを修正
+* Room: ライティングの調整
+
+11.28.2 (2019/08/18)
+--------------------
+### 🐛Fixes
+* 他人の部屋なのに部屋編集UIが表示されるのを修正
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
+
+11.28.1 (2019/08/18)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
+* Roomで家具を移動など確定せずに「しまう」と部屋ごと消える問題を修正
+
+11.28.0 (2019/08/18)
+--------------------
+### ✨Improvements
+* 自分の部屋を作れるように
+* Delキーを押して投稿を削除するときに確認ダイアログを出すように
+* Elasticsearchのインデックス名をconfigで変更できるように
+
+### 🐛Fixes
+* コンテンツを遡ってる途中に新しいアイテムが先頭に追加されると上限に達している場合末尾のアイテムが削除される問題を修正
+* ユーザー名が突き抜けるのを修正
+* ユーザー一覧とかでサイレンス・凍結されたユーザーの状態が表示されてなかったのを修正
+* タイトルやアイコンがきちんと設定されないことがあるのを修正
+* ドライブアップロード直後に取得できるURLがoriginalじゃない問題を修正
+* リモートユーザー向けのNoteUnreadsレコードが作成される問題を修正
+* Hashtagがupdateできない問題を修正
+* ハッシュタグの更新がタグの数だけ並列で行われてDBを重くしてしまうことがあるのを修正
+
+11.27.1 (2019/08/01)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージに関する問題を修正
+
+11.27.0 (2019/07/29)
+--------------------
+### ✨Improvements
+* 「削除して編集」機能を追加
+* HTTPリクエストのKeep-AliveとPrxoy対応(サーバーのパフォーマンス向上)
+* 通知を種類でフィルタリングして表示できるように
+* モバイルで通知ページを表示することができるように
+* 非ログイン時の警告処理
+
+### 🐛Fixes
+* リモートの絵文字が更新されない問題を修正
+* リンクバリデーションリンクが一瞬表示されてしまう問題を修正
+* 選択していない状態でウィジェットが追加できる問題を修正
+
+11.26.2 (2019/07/25)
+--------------------
+### 🐛Fixes
+* すでに使われたことのあるユーザー名を再度使えないように
+* モバイルのウィジェットページが常に i/update-client-setting を呼び続ける問題を修正
+* 投稿フォームのヘッダに添付ファイル数がちゃんと表示されない問題を修正
+
+11.26.1 (2019/07/21)
+--------------------
+### 🐛Fixes
+* リモートアンケートの期限が保存されないのを修正
+* 自分をブロックしているユーザーがおすすめユーザーに表示されている問題を修正
+* スクロールしてると絵文字ピッカーの位置がずれる問題を修正
+* 投稿フォームが画面外にはみ出さないように
+* 投稿フォームの「引用付き」の表示が見づらい問題の修正
+* 投稿フォームにもうリノートや引用ノートのデータがある場合はリンクを貼っても「引用として添付しますか？」のダイアログボックスが出ないように
+* 「タイムライン上部に投稿フォームを表示する」機能の使用時、ノートを投稿しても引用ノートのデータが残る問題の修正
+* デスクトップ版のアクティビティウィジェットの日付とデータの表示が変だったのを修正
+
+11.26.0 (2019/07/19)
+--------------------
+### ✨Improvements
+* モデレーターログを記録して確認できるように
+* プロフィールに追加情報を設定できるように
+* Mastodonのリンクの所有者認証に対応
+* AP: Delete Person アクティビティを配信するように
+* AP: Delete アクティビティの後にフォロー解除するように
+* AP: アカウント削除でもDelete activityを配信するように
+* Pages: ラジオボタンを追加
+* AdminページのUsers Viewでユーザーのレコードをクリックすることですぐユーザーを照会できるように
+* AdminページのUsers Viewでユーザー一覧からユーザー名とホスト情報で検索できるように
+* 特定ホストへのメンションの特別処理をクライアントに追加
+* 設定画面でデスクトップ・モバイルモード変更時はすぐにrefreshするか伺うように
+* ペーストされたファイル名のテンプレート変更時すぐどのようになるか見れるように
+* （ｺ｀・ﾍ・´ｹ）を追加
+
+### 🐛Fixes
+* ログインのログが正しく保存されない問題を修正
+* 同じユーザー名のユーザーが作成できてしまうことがある問題を修正
+* 報告されたレポート内容が表示されない問題を修正
+* リモートのプロフィールの追加情報が表示されない問題を修正
+* 「見つける」のタグが大文字小文字区別されている問題を修正
+* 管理画面のインスタンス一覧でソートが正しく機能していない問題を修正
+* プロフィール設定でバナーに動画を設定すると以降編集ができない問題を修正
+* ウェブ検索エンジンの設定でグリッチが発生する問題を修正
+* MFMの引用がインライン表示になっている問題を修正
+* アンケートの期限入力部分のタイトル表示がおかしい問題を修正
+* 画面上の項目がすべていなくなると実際はロードされてないだけのファイルやフォルダーがあるにも関わらず「もっと読み込む」ボタンがなくなり「このフォルダーは空です」っていうplaceholderが表示されてしまう問題を修正
+* proxy-media後のContent-Typeが違う問題を修正
+* ビルド時にエラーが出るのを修正
+
 11.25.1 (2019/07/09)
 --------------------
 ### 🐛Fixes
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -7,12 +7,18 @@ Feature suggestions and bug reports are filed in https://github.com/syuilo/missk
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.

+## Branches
+* **master** branch is tracking the latest release and used for production purposes.
+* **develop** branch is where we work for the next release.
+* **l10n_develop** branch is reserved for localization management.
+
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
-Changes you make in Crowdin will be merged into the develop branch by @syuilo.
+Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
+The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.

-If you cannot find the language you want to contribute with, please open an issue.
+If your language is not listed in Crowdin, please open an issue.

 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)

@ -32,8 +38,18 @@ Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/intr
 Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).

-## FAQ
+## Adding MisskeyRoom items
+* Use English for material, object and texture names.
+* Use meter for unit of length.
+* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
+* Your PR must include the glTF binary files (`.glb`) of your models.
+* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
+* Add a furniture definition at [`/src/client/app/common/scripts/room/furnitures.json5`](/src/client/app/common/scripts/room/furnitures.json5).

+If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
+You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
+
+## FAQ
 ### How to resolve conflictions occurred at yarn.lock?

 Just execute `yarn` to fix it.
@ -93,6 +109,8 @@ Good:
 if (foo) bar;
 ```

+Make sure that the condition and the body statement are on the same line.
+
 ### Do not use `==` when it can simply be replaced with `===`.
 🥰

@ -252,3 +270,7 @@ npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```

 作成されたスクリプトは不必要な変更を含むため除去してください。
+
+## その他
+### HTMLのクラス名で follow という単語は使わない
+広告ブロッカーで誤ってブロックされる
--- a/5
+++ b/5
@ -1,4 +1,4 @@
-FROM node:12.6-alpine AS base
+FROM node:12.11.1-alpine AS base

 ENV NODE_ENV=production

@ -23,9 +23,10 @@ RUN apk add --no-cache \
    zlib-dev

 COPY package.json ./
-RUN yarn install
+RUN yarn install --prod=false
 COPY . ./
 RUN yarn build
+RUN yarn install --prod

 FROM base AS runner

--- a/README.md
+++ b/README.md
@ -103,77 +103,71 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20010324/b8af4bd31ae34fbf8806cc0e6228e400/1.png?token-time=2145916800&token-hash=iyiocfousNIUwASmatsIDq8EOsmLUdrQNkWyktHlmJg%3D" alt="Nemo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
+<td><a href="https://www.patreon.com/user?u=20010324">Nemo</a></td>
 <td><a href="https://www.patreon.com/weepjp">weepjp</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
-<td><a href="https://www.patreon.com/user?u=557245">mkatze</a></td>
-<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
-<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/osapon">osapon</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/osapon">osapon</a></td>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
+<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/83884b38afc74d4cbe83c30a13b10edd/1.png?token-time=2145916800&token-hash=R5Tog8RWg0rguRoCIoir3lThokrdPvs8Utfikhc0nhY%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4.jpe?token-time=2145916800&token-hash=UslrPVM-8TXOe8AapuNiaFYjcIJgPNcU-fKpGbfGJNI%3D" alt="Damillora" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1.jpeg?token-time=2145916800&token-hash=l4AoMR7Nj7K4yAHrkrk2hAoggPkbSPm12m1nmbe9Pb8%3D" alt="Naoki Hirayama" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
 <td><a href="https://www.patreon.com/takimura">takimura</a></td>
+<td><a href="https://www.patreon.com/damillora">Damillora</a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
-<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 <td><a href="https://www.patreon.com/noellabo">noellabo</a></td>
 <td><a href="https://www.patreon.com/Corset">CG</a></td>
 <td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
-<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
 </tr></table>
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
+<td><a href="https://www.patreon.com/user?u=23932002">nenohi</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Tue, 16 Jul 2019 10:23:06 UTC
+**Last updated:** Fri, 18 Oct 2019 05:33:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/assets/icons/512.png
+++ b/assets/icons/512.png
--- a/assets/icons/icon.svg
+++ b/assets/icons/icon.svg
--- a/assets/ss/user.jpg
+++ b/assets/ss/user.jpg
--- a/docs/examples/misskey.nginx
+++ b/docs/examples/misskey.nginx
@ -1,7 +1,7 @@
 # Sample nginx configuration for Misskey
 #
 # 1. Replace example.tld to your domain
-# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-ebabled/
+# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-enabled/
 #    or copy to /etc/nginx/conf.d/

 # For WebSocket
@ -25,10 +25,9 @@ server {
 }

 server {
-    listen 443 http2;
-    listen [::]:443 http2;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
    server_name example.tld;
-    ssl on;
    ssl_session_cache shared:ssl_session_cache:10m;

    # To use Let's Encrypt certificate
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@ -51,7 +51,7 @@ Please install and setup these softwares:

 5. Install misskey dependencies.

-	`yarn`
+	`yarn install --prod=false`

 *4.* Configure Misskey
 ----------------------------------------------------------------
@ -130,7 +130,7 @@ You can check if the service is running with `systemctl status misskey`.
 ### How to update your Misskey server to the latest version
 1. `git checkout master`
 2. `git pull`
-3. `yarn install`
+3. `yarn install --prod=false`
 4. `NODE_ENV=production yarn build`
 5. `yarn migrate`
 6. Restart your Misskey process to apply changes
@ -138,7 +138,7 @@ You can check if the service is running with `systemctl status misskey`.

 If you encounter any problems with updating, please try the following:
 1. `yarn clean` or `yarn cleanall`
-2. Retry update (Don't forget `yarn install`
+2. Retry update (Don't forget `yarn install --prod=false`)

 ----------------------------------------------------------------

--- a/docs/setup.fr.md
+++ b/docs/setup.fr.md
@ -51,7 +51,7 @@ Installez les paquets suivants :
 
 5. Installez les dépendances de misskey.

-	`yarn install`
+	`yarn install --prod=false`

 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
@ -124,7 +124,7 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git checkout master`
 2. `git pull`
-3. `yarn install`
+3. `yarn install --prod=false`
 4. `NODE_ENV=production yarn build`
 5. `yarn migrate`

--- a/docs/setup.ja.md
+++ b/docs/setup.ja.md
@ -53,7 +53,7 @@ adduser --disabled-password --disabled-login misskey

 5. Misskeyの依存パッケージをインストール

-	`yarn install`
+	`yarn install --prod=false`

 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
@ -132,7 +132,7 @@ yarn run init
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git checkout master`
 2. `git pull`
-3. `yarn install`
+3. `yarn install --prod=false`
 4. `NODE_ENV=production yarn build`
 5. `yarn migrate`

--- a/gulpfile.ts
+++ b/gulpfile.ts
@ -47,9 +47,14 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );

-gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
+gulp.task('build:copy:fonts', () =>
+	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
+);
+
+gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () =>
 	gulp.src([
 		'./src/const.json',
+		'./src/emojilist.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
 		'!./src/client/app/**/assets/**/*'
--- a/index.js
+++ b/index.js
@ -1 +1,7 @@
-require('./built').default();
+const fs = require('fs');
+
+if (fs.existsSync('./built')) {
+	require('./built').default();
+} else {
+	console.log('Built code is not found. Probably an error occurred during a build or you just forgot to build.');
+}
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@ -18,9 +18,6 @@ common:
    drive: "Disk"
    drive-desc: "Chcete sdílet obrázek, který jste již nahráli? Chcete vaše nahrané soubory organizovat, pojmenovávat a vytvářet pro ně složky? Misskey Disk je pro vás nejlepší řešení. Je velmi snadné sdílet vaše soubory online."
    outro: "Podívejte se na unikátní vlastnosti Misskey vlastníma očima! Pokud si myslíte, že tato instance není pro vás, zkuste jiné instance, neboť Misskey je decentralizovaná sociální síť, takže můžete snadno najít své přátele. Hodně štěstí a zábavy!"
-  adblock:
-    detected: "Prosím vypněte svůj blokovač reklam"
-    warning: "Některé vlastnosti mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam. <strong>Misskey nepoužívá reklamy</strong>."
  application-authorization: "Autorizované aplikace"
  close: "Zavřít"
  do-not-copy-paste: "Prosím nezadávejte ani nevkládejte sem kód. Váš účet může být kompromitován."
@ -34,6 +31,20 @@ common:
  signup: "Registrovat"
  signout: "Odhlásit"
  reload-to-apply-the-setting: "Pro uplatnění tohoto nastavení musíte znovu načíst tuto stránku. Chcete ji načíst teď?"
+  fetching-as-ap-object: "Načítám data z Fediversu..."
+  delete-confirm: "Opravdu chcete smazat tento příspěvek?"
+  signin-required: "Přihlašte se, prosím"
+  notification-type: "Typy oznámení"
+  notification-types:
+    all: "Všechny"
+    pollVote: "Hlasy"
+    follow: "Sledovaní"
+    receiveFollowRequest: "Žádost o sledování"
+    reply: "Odpovědi"
+    quote: "Citace"
+    renote: "Renotovat"
+    mention: "Zmínky"
+    reaction: "Reakce"
  got-it: "Rozumím!"
  customization-tips:
    title: "Tipy pro přizpůsobení"
@ -89,7 +100,11 @@ common:
    "read:notifications": "Prohlížet oznámení"
    "write:notifications": "Pracovat s oznámeními"
    "read:reactions": "Prohlížet reakce"
+    "write:reactions": "Narabět s reakcemi"
    "write:votes": "Hlasovat"
+    "read:pages": "Zhlédnutí stránky"
+    "write:pages": "Upravit stránky"
+    "write:user-groups": "Upravit uživatelskou skupinu"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
    explore: "Najít uživatele"
@ -98,21 +113,27 @@ common:
    hide-contents: "Schovat obsah"
    reply-placeholder: "Odpovědět na tento příspěvek"
    quote-placeholder: "Citovat tento příspěvek"
+    quote-attached: "Přiložit citaci"
    submit: "Odeslat"
    reply: "Odpovědět"
    renote: "Renotovat"
    posting: "Posílání"
    attach-media-from-local: "Nahrát soubor z vašeho zařízení"
+    attach-media-from-drive: "Přiložit soubory z vašeho Drivu"
    insert-a-kao: "v('ω')v"
    create-poll: "Vytvořit anketu"
    text-remain: "zbývá ještě {} znaků"
    recent-tags: "Nejnovější"
+    local-only-message: "Publikovat zprávu pouze lokálně"
+    click-to-tagging: "Klikni pro otágování"
    visibility: "Viditelnost"
    geolocation-alert: "Vaše zařízení nedalo k dispozici lokaci"
    error: "Chyba"
    enter-username: "Zadejte své uživatelské jméno"
+    specified-recipient: "Pro"
    add-visible-user: "Přidat uživatele"
    username-prompt: "Zadejte své uživatelské jméno"
+    enter-file-name: "Upravit název souboru"
  weekday-short:
    sunday: "Ne"
    monday: "Po"
@ -172,6 +193,7 @@ common:
    other: "Ostatní"
    appearance: "Vzhled"
    behavior: "Chování"
+    reactions: "Reakce"
    fetch-on-scroll: "Nekonečné načítaní posuvem"
    fetch-on-scroll-desc: "Pokud budete rolovat dolů po stránce, automaticky bude načten další obsah."
    note-visibility: "Viditelnost příspěvku"
@ -179,6 +201,9 @@ common:
    remember-note-visibility: "Zapamatovat viditelnost příspěvků"
    web-search-engine: "Webové vyhledávače"
    web-search-engine-desc: "Například: https://www.google.com/?#q={{query}}"
+    paste: "Vložit"
+    pasted-file-name-desc: "Například: \"rrrr-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Upravit název vloženého souboru"
    keep-cw: "Zachovat varování o obsahu"
    keep-cw-desc: "Při odpovědi na příspěvek bude varování o obsahu nastaveno stejně jako původní příspěvek."
    i-like-sushi: "Mam radši sushi (než puding)"
@ -216,7 +241,7 @@ common:
    deck-column-width-wide: "Široké"
    use-shadow: "Používat v rozhraní stíny"
    rounded-corners: "Zakulatit rohy v rozhraní"
-    circle-icons: "Používat kulaté ikony"
+    circle-icons: "Používat kulaté avatary"
    contrasted-acct: "Přidat uživatelskému účtu kontrast"
    wallpaper: "Obrázek na pozadí"
    choose-wallpaper: "Zvolit pozadí"
@ -264,6 +289,15 @@ common:
    sync: "Synchronizace"
    save: "Uložit"
    saved: "Uloženo"
+    room: "Místnost"
+    _room:
+      graphicsQuality: "Kvalita grafiky"
+      _graphicsQuality:
+        ultra: "Nejvyšší"
+        high: "Vysoká"
+        medium: "Střední"
+        low: "Nízká"
+        cheep: "Nejnižší"
  search: "Hledání"
  delete: "Odstranit"
  loading: "Načítám..."
@ -356,7 +390,9 @@ common/views/components/games/reversi/reversi.vue:
    cancel: "Zrušit"
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Vzdát se"
+  surrendered: "Vzdaním se"
  looped-map: "Zacyklená mapa"
+  can-put-everywhere: "Lze položit kamkoliv"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "Hrajte Reversi s Vašimi kamarády!"
@ -389,6 +425,7 @@ common/views/components/connect-failed.vue:
  title: "Nelze se připojit k serveru"
  description: "Nastal problém s Vaším připojením k internetu, nebo server není dostupný nebo zrovna probíhá údržba. Prosím {zkuste to znova} za pár minut."
  thanks: "Děkujeme že jste použili Misskey."
+  troubleshoot: "Odstranění problémů"
 common/views/components/connect-failed.troubleshooter.vue:
  title: "Poradce při potížích"
  network: "Síťové připojení"
@ -397,12 +434,15 @@ common/views/components/connect-failed.troubleshooter.vue:
  checking-internet: "Ověřuji připojení k internetu."
  server: "Připojení k serveru"
  checking-server: "Spojuji se se serverem"
+  finding: "Vyšetřování problému"
+  no-network: "Žádné připojení k síti"
  no-network-desc: "Ujistěte se že jste připojeni k Internetu."
  no-internet: "Nejste připojeni k internetu"
  no-internet-desc: "Jste připojen k síti, ale zdá se že stále chybí připojení k Internetu. Prosím zkontrolujte Vaše připojení k Internetu."
  no-server: "Nelze se připojit k serveru Misskey"
  success: "Úspěšně se podařilo spojit s Misskey serverem"
  flush: "Vyčistit mezipaměť"
+  set-version: "Vyberte verzi"
 common/views/components/media-banner.vue:
  sensitive: "Choulostivý obsah"
  click-to-show: "Klikněte pro zobrazení"
@ -456,6 +496,7 @@ common/views/components/messaging.vue:
  group: "Skupina"
  start-with-user: "Zahájit konverzaci s uživatelem"
  start-with-group: "Zahájit skupinovou konverzaci"
+  select-group: "Vybrat skupinu"
 common/views/components/messaging-room.vue:
  new-message: "Máte novou zprávu"
 common/views/components/messaging-room.form.vue:
@ -488,6 +529,7 @@ common/views/components/note-menu.vue:
  unpin: "Odepnout"
  delete: "Odstranit"
  delete-confirm: "Opravdu chcete smazat tento příspěvek?"
+  delete-and-edit: "Smazat a upravit"
  remote: "Ukázat originální poznámku"
 common/views/components/user-menu.vue:
  mention: "Zmínění"
@ -526,6 +568,7 @@ common/views/components/poll-editor.vue:
  deadline-date: "Termín ukončení"
  deadline-time: "Doba trvání"
  interval: "Trvání"
+  unit: "Jednotka"
  second: "Sekunda"
  minute: "Minuta"
  hour: "Hodina"
@ -544,6 +587,12 @@ common/views/components/emoji-picker.vue:
  symbols: "Symboly"
  flags: "Vlajky"
 common/views/components/settings/app-type.vue:
+  title: "Režim"
+  intro: "Můžete vybrat zdali chcete použít stolní, nebo mobilní vzhled."
+  choices:
+    auto: "Vybrat vzhled automaticky"
+    desktop: "Vždy použít stolní vzhled"
+    mobile: "Vždy použít mobilní vzhled"
  info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/signin.vue:
  username: "Přezdívka"
@ -555,6 +604,7 @@ common/views/components/signin.vue:
  signin-with-github: "Přihlásit se pomocí účtu GitHub"
  signin-with-discord: "Přihlásit se pomocí účtu Discord"
  login-failed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
+  enter-2fa-code: "Vložte Váš verifikační kód"
 common/views/components/signup.vue:
  invitation-code: "Kód pozvánky"
  invitation-info: "Pokud máte pozvánku, prosím kontaktujte <a href=\"{}\">administrátora</a>."
@ -576,6 +626,7 @@ common/views/components/signup.vue:
  password-matched: "OK"
  password-not-matched: "Neshodují se"
  recaptcha: "Potvrzení"
+  agree-to: "Souhlasím s {0}."
  tos: "Podmínky užívání"
  create: "Vytvořit účet"
  some-error: "Pokus o vytvoření účtu selhal. Prosím zkuste to znovu."
@ -592,8 +643,10 @@ common/views/components/notification-settings.vue:
  mark-as-read-all-unread-notes: "Označit všechny příspěvky za přečtené"
  mark-as-read-all-talk-messages: "Označit všechny zprávy za přečtené"
 common/views/components/integration-settings.vue:
+  title: "Integrace"
  connect: "Připojit"
  disconnect: "Odpojit"
+  connected-to: "Jste připojen k tomuto GitHub účtu"
 common/views/components/github-setting.vue:
  description: "Jakmile spojíte Váš GitHub účet s Vaším Misskey účtem, uvidíte informace o Vašem GitHub účtu na Vašem profilu a budete se moci přihlásit skrze GitHub."
  connected-to: "Je připojen k tomuto GitHub účtu"
@ -613,6 +666,8 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
  public: "Veřejné"
  home: "Domů"
+  home-desc: "Poslat pouze na domovskou časovou osu"
+  specified: "Přímá"
  specified-desc: "Poslat pouze zmíněným uživatelům"
  local-public: "Veřejná (pouze místní)"
  local-public-desc: "Nepublikovat na vzdálených serverech"
@ -664,6 +719,8 @@ common/views/components/profile-editor.vue:
  danger-zone: "Nebezpečná zóna"
  delete-account: "Smazat účet"
  account-deleted: "Váš účet byl smazán. Může chvilku trvat než zmizí všechna data."
+  profile-metadata: "Metadata profilu"
+  metadata-label: "Popis"
  metadata-content: "Obsah"
 common/views/components/user-list-editor.vue:
  users: "Uživatel"
@ -695,12 +752,14 @@ common/views/components/user-groups.vue:
  group-name: "Název skupiny"
  owned-groups: "Moje skupiny"
  invites: "Pozvat"
+  accept-invite: "Přidat se"
  reject-invite: "Odmítnout"
 common/views/widgets/broadcast.vue:
  fetching: "Načítám"
  no-broadcasts: "Žádná nová oznámení"
  have-a-nice-day: "Přejeme Vám příjemný den!"
  next: "Další"
+  prev: "Předchozí"
 common/views/widgets/calendar.vue:
  year: "Rok {}"
  month: "{},"
@ -709,6 +768,7 @@ common/views/widgets/calendar.vue:
  this-month: "Měsíc:"
  this-year: "Rok:"
 common/views/widgets/photo-stream.vue:
+  title: "Foto stream"
  no-photos: "Žádné obrázky"
 common/views/widgets/posts-monitor.vue:
  title: "Grafy příspěvků"
@ -724,6 +784,8 @@ common/views/widgets/memo.vue:
  save: "Uložit"
 common/views/widgets/slideshow.vue:
  no-image: "V této složce nebyly nalezeny žádné fotky."
+common/views/widgets/tips.vue:
+  tips-line23: "Ai-chan kawaii!"
 common/views/pages/not-found.vue:
  page-not-found: "Stránka nenalezena"
 common/views/pages/follow.vue:
@ -795,6 +857,7 @@ desktop/views/components/drive.folder.vue:
    input-new-folder-name: "Zadejte nové jméno"
    else-folders: "Ostatní"
 desktop/views/components/drive.vue:
+  search: "Vyhledávání"
  empty-drive-description: "Klikněte pravým tlačítkem myši pro otevření menu, nebo sem přetáhněte soubor pro nahrání."
  empty-folder: "Tato složka je prázdná"
  unable-to-process: "Operace nemohla být dokončena."
@ -810,10 +873,13 @@ desktop/views/components/drive.vue:
    url-upload: "Nahrát z URL"
 desktop/views/components/media-video.vue:
  click-to-show: "Klikněte pro zobrazení"
+desktop/views/components/followers.vue:
+  empty: "Vypadá to že Vás nikdo nesleduje."
 desktop/views/components/game-window.vue:
  game: "Reversi"
 desktop/views/components/home.vue:
  done: "Hotovo"
+  add-widget: "Přidat widget:"
  add: "Přidat"
 desktop/views/input-dialog.vue:
  cancel: "Zrušit"
@ -821,6 +887,7 @@ desktop/views/input-dialog.vue:
 desktop/views/components/note-detail.vue:
  private: "Tento příspěvek je soukromý"
  deleted: "Tento příspěvek byl odstraněn"
+  location: "Lokace"
  renote: "Renotovat"
  add-reaction: "Přidat reakci"
  undo-reaction: "Odebrat reakci"
@ -835,6 +902,8 @@ desktop/views/components/note.vue:
 desktop/views/components/notes.vue:
  error: "Načítání selhalo."
  retry: "Opakovat"
+desktop/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 desktop/views/components/post-form.vue:
  posted: "Odesláno!"
  replied: "Odpověděno!"
@ -859,10 +928,29 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/components/settings.2fa.vue:
  detail: "Více…"
  url: "https://www.google.cz/landing/2step/"
+  register: "Přidat zařízení"
+  already-registered: "Toto zařízení je již připojené"
+  unregister: "Odebrat"
+  enter-password: "Prosím zadejte heslo"
+  authenticator: "Nejprve musíte nainstalovat Google Authenticator na Vašem zařízení:"
+  howtoinstall: "Jak nainstalovat"
  token: "Token"
+  scan: "Poté naskenujte QR kód:"
+  done: "Prosím vložte kód zobrazený na Vašem zařízení:"
+  submit: "Uložit"
+  success: "Nastavení uloženo!"
+  failed: "Nepodařilo se spárovat. Prosím zkontrolujte správnost bezpečnostního kódu."
+  totp-header: "Ověřovací aplikace"
+  security-key-header: "Bezpečnostní klíč"
+  last-used: "Naposledy použito:"
+  activate-key: "Klikněte pro aktivaci bezpečnostního klíče"
+  security-key-name: "Název klíče"
+  key-unregistered: "Bezpečnostní klíč byl odstraněn"
 common/views/components/media-image.vue:
+  sensitive: "NSFW"
  click-to-show: "Klikněte pro zobrazení"
 common/views/components/api-settings.vue:
+  caution: "Nepoužívejte tento kód v žádné jiné aplikace nebo ho sdílejte s ostatními (jinak můžete ohrozit svojí bezpečnost)."
  token: "Token:"
  enter-password: "Prosím zadejte heslo"
  console:
@ -918,6 +1006,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Seznamy"
  groups: "Skupiny"
  admin: "Administrace"
+  room: "Místnost"
 desktop/views/components/ui.header.nav.vue:
  game: "Hry"
 desktop/views/components/ui.header.notifications.vue:
@ -943,20 +1032,48 @@ admin/views/index.vue:
  announcements: "Oznámení"
  queue: "Fronta úloh"
  logs: "Logy"
+  db: "Databáze"
  back-to-misskey: "Zpět na Misskey"
+admin/views/db.vue:
+  tables: "Tabulky"
+  vacuum: "Vysavač"
+  vacuum-info: "Uklidí databázi. Neohrozí data a sníží využití disku. Tohle se děje automaticky a opakovaně."
+  vacuum-exclamation: "Vysavač může dočasně přetížit databázi a dočasně omezit akce uživatelů."
 admin/views/dashboard.vue:
+  dashboard: "Kontrolní panel"
  accounts: "Účty"
  notes: "Poznámky"
  drive: "Disk"
  instances: "Instance"
  this-instance: "Tato instance"
  federated: "Z fedivesmíru"
+admin/views/queue.vue:
+  title: "Ve frontě"
+  remove-all-jobs: "Vyčistit frontu"
+  jobs: "Úkoly"
+  queue: "Ve frontě"
+  domains:
+    inbox: "Obdržené"
+    db: "Databáze"
+  states:
+    active: "V procesu"
+    delayed: "Naplánováno"
+    waiting: "Ve frontě"
+  result-is-truncated: "Zkrácený výsledek"
 admin/views/logs.vue:
  logs: "Logy"
+  domain: "Doména"
+  level: "Úroveň"
  levels:
+    all: "Vše"
    info: "Informace"
+    success: "Podařilo se"
+    warning: "Varování"
    error: "Chyba"
+    debug: "Debug"
+  delete-all: "Smazat vše"
 admin/views/abuse.vue:
+  target: "Cíl"
  details: "Popis"
  remove-report: "Odstranit"
 admin/views/instance.vue:
@ -964,17 +1081,33 @@ admin/views/instance.vue:
  instance-name: "Název instance"
  instance-description: "Popis instance"
  host: "Hostitel"
+  icon-url: "URL ikonky"
+  logo-url: "URL loga"
  banner-url: "URL pro baner"
+  error-image-url: "URL pro chybový obrázek"
  languages: "Jazyk této instance"
  languages-desc: "Můžete nastavit více než jeden, oddělte mezerami."
+  tos-url: "URL pro smluvní podmínky"
+  repository-url: "URL adresa repositáře"
+  feedback-url: "URL pro zpětnou vazbu"
  maintainer-config: "Informace o administrátorovi"
  maintainer-name: "Jméno administrátora"
  maintainer-email: "Kontakt na administrátora"
+  advanced-config: "Další nastavení"
+  object-storage-base-url: "URL"
+  object-storage-prefix: "Předpona"
  object-storage-endpoint: "Endpoint"
+  object-storage-region: "Region"
+  object-storage-port: "Port"
+  object-storage-access-key: "Přístupový klíč"
+  object-storage-secret-key: "Tajný Klíč (Secret Key)"
+  object-storage-use-ssl: "Použít SSL"
+  object-storage-s3-info-here: "zde"
  mb: "V megabajtech"
  recaptcha-config: "nastavení služby reCAPTCHA"
  recaptcha-info: "reCAPTCHA token je povinný. Můžete jej získat na https://www.google.com/recaptcha/intro/"
  enable-recaptcha: "povolit reCAPTCHA"
+  recaptcha-secret-key: "Tajný Klíč (Secret Key)"
  recaptcha-preview: "Náhled"
  twitter-integration-config: "Nastavení spojení s Twitterem"
  twitter-integration-info: "The callback URL is set on {url}."
@ -1173,6 +1306,9 @@ desktop/views/widgets/notifications.vue:
  title: "Oznámení"
 desktop/views/widgets/polls.vue:
  title: "Ankety"
+  nothing: "Žádné nové notifikace!"
+desktop/views/widgets/trends.vue:
+  nothing: "Žádné nové notifikace!"
 desktop/views/widgets/users.vue:
  title: "Doporučení uživatelé"
 mobile/views/components/drive.vue:
@ -1215,6 +1351,8 @@ mobile/views/components/note-sub.vue:
  admin: "admin"
  bot: "bot"
  cat: "kočka"
+mobile/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 mobile/views/components/sub-note-content.vue:
  private: "Tento příspěvek je soukromý"
  deleted: "Tento příspěvek byl odstraněn"
@ -1258,9 +1396,12 @@ mobile/views/pages/note.vue:
 mobile/views/pages/games/reversi.vue:
  reversi: "Reversi"
 mobile/views/pages/search.vue:
+  search: "Vyhledávání"
  not-found: "Pro '{q}' nebyly nalezeny žádné příspěvky."
 mobile/views/pages/selectdrive.vue:
  select-file: "Vybrat soubory"
+mobile/views/pages/notifications.vue:
+  notifications: "Oznámení"
 mobile/views/pages/user/home.vue:
  activity: "Aktivita"
  frequently-replied-users: "Častá zmínění"
@ -1329,3 +1470,10 @@ pages:
        arg1: "Seznamy"
    types:
      array: "Seznamy"
+room:
+  translate: "Přesunout"
+  save: "Uložit"
+  saved: "Uloženo"
+  furnitures:
+    moon: "Měsíc"
+    bin: "Koš"
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@ -18,9 +18,6 @@ common:
    drive: "Drev"
    drive-desc: "Vil du poste et billede, som du tidligere har uploadet? Har du brug for at navngive filer og organisere dem i mapper, som du selv har navngivet? Så er Misskey Drev den bedste løsning for dig. Den gør det så let som ingenting at dele dine filer online."
    outro: "Tjek Misskey's unikke funktioner ved at se dem med dine egne øjne. Hvis du kommer frem til, at den ene server ikke er noget for dig, så kan du prøve en anden. Misskey er et decentraliseret SNS, så du kan lettere finde frem til brugere, som du klikker med. God fornøjelse!"
-  adblock:
-    detected: "Her kan du deaktivere ad blocker."
-    warning: "Visse funktioner kan forsvinde eller medføre forstyrrelser, hvis ad blocking er aktiveret. <strong>Misskey kører ikke annoncer</strong>."
  application-authorization: "Adgangsstyring"
  close: "Luk"
  do-not-copy-paste: "Undgå venligst at skrive eller klistre kode ind her. I modsat fald kan din konto blive kompromitteret."
@ -35,6 +32,13 @@ common:
  signout: "Log ud"
  reload-to-apply-the-setting: "Denne indstilling slår først igennem, når du har genindlæst siden. Vil du genindlæse siden nu?"
  fetching-as-ap-object: "Tilladelse til sammenkobling"
+  delete-confirm: "Er du helt sikker på, at du vil slette denne post?"
+  notification-types:
+    all: "Alle"
+    follow: "Følger"
+    reply: "Svar"
+    renote: "Gen-postering"
+    reaction: "Reaktion"
  got-it: "Det er OK"
  customization-tips:
    title: "Tips om tilpasning"
@ -162,6 +166,7 @@ common:
    other: "Andet"
    appearance: "Udseende"
    behavior: "Opførsel"
+    reactions: "Reaktion"
    fetch-on-scroll: "Uendeligt scroll"
    fetch-on-scroll-desc: "Når du scroller ned ad siden, hentes der automatisk nyt indhold ind"
    note-visibility: "Post synlighed"
@ -206,7 +211,7 @@ common:
    deck-column-width-wide: "Bred"
    use-shadow: "Vis skygger"
    rounded-corners: "Vis afrundede hjørner"
-    circle-icons: "Anvend cykliske ikoner"
+    circle-icons: "Anvend cykliske avatar"
    contrasted-acct: "Tilføj kontrast til brugerkontoen"
    wallpaper: "Baggrundsbillede"
    choose-wallpaper: "Vælg en baggrund"
@ -673,7 +678,7 @@ common/views/components/profile-editor.vue:
  you-can-include-hashtags: "Du må gerne bruge hashtags i din profil beskrivelse"
  language: "Sprog"
  birthday: "Fødselsdag"
-  avatar: "Ikon"
+  avatar: "Avatar"
  banner: "Banner"
  is-cat: "Denne konto er en Kat"
  is-bot: "Denne konto er en Bot"
@ -1606,6 +1611,8 @@ mobile/views/pages/search.vue:
  not-found: "Ingen poster fundet for \"{q}\""
 mobile/views/pages/selectdrive.vue:
  select-file: "Vælg fil(er)"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifikationer"
 mobile/views/pages/settings.vue:
  signed-in-as: "Logget ind som {}"
 mobile/views/pages/user.vue:
@ -1901,3 +1908,10 @@ pages:
    enviromentVariables: "Miljø variabel"
    pageVariables: "Side element"
    argVariables: "Input slot"
+room:
+  translate: "Flyt"
+  save: "Gem"
+  saved: "Gemt"
+  furnitures:
+    moon: "Måne"
+    bin: "Skraldespand"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
    outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
-  adblock:
-    detected: "Bitte deaktiviere den Werbeblocker."
-    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
  application-authorization: "Autorisierte Anwendungen"
  close: "Schließen"
  do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
@ -35,6 +32,10 @@ common:
  signout: "Ausloggen"
  reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
  fetching-as-ap-object: "Hole Daten…"
+  delete-confirm: "Diesen Beitrag löschen?"
+  notification-types:
+    reply: "Antworten"
+    renote: "Anmerkung"
  got-it: "Verstanden!"
  customization-tips:
    title: "Anpassung-Tipps"
@ -203,7 +204,7 @@ common:
    deck-column-width-wide: "Sehr breit"
    use-shadow: "Nutze Schatten"
    rounded-corners: "Abgerundete Ecken"
-    circle-icons: "Kreisförmige Icons"
+    circle-icons: "Kreisförmige Avatar"
    contrasted-acct: "Nutzernamen kontrastreicher darstellen"
    wallpaper: "Hintergrund"
    choose-wallpaper: "Hintergrund auswählen"
@ -601,6 +602,7 @@ common/views/widgets/memo.vue:
  save: "Speichern"
 desktop:
  banner: "Banner"
+  avatar: "Avatar"
  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
@ -876,6 +878,8 @@ mobile/views/pages/note.vue:
  next: "Nächster Kommentar"
 mobile/views/pages/search.vue:
  search: "Suchen"
+mobile/views/pages/notifications.vue:
+  notifications: "Benachrichtigungen"
 mobile/views/pages/user/home.vue:
  activity: "Aktivität"
  keywords: "Schlagwörter"
@ -940,3 +944,9 @@ pages:
        arg1: "Listen"
    types:
      array: "Listen"
+room:
+  save: "Speichern"
+  saved: "Gespeichert"
+  furnitures:
+    moon: "Mond"
+    bin: "Papierkorb"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -12,15 +12,12 @@ common:
    rich-contents: "Post"
    rich-contents-desc: "Just post your idea, hot topics, and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files, including videos, or create a poll - those are some of the things you can do with Misskey!"
    reaction: "Reactions"
-    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various kinds of reactions to other's posts. The emotional experience on Misskey will never be on other SNSs, which are only able to push “likes”."
+    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various reactions to posts. Other SNSs only have a \"like\" reaction."
    ui: "Interface"
    ui-desc: "No single UI can suit everyone. Therefore, Misskey has a highly customizable UI for your tastes. You can make your home original by editing the layout of your timeline, and moving around selectable widgets that you can easily adjust to make this place your own."
    drive: "Drive"
    drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
    outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
-  adblock:
-    detected: "Please disable ad blocker."
-    warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
  application-authorization: "Application authorizations"
  close: "Close"
  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
@ -30,12 +27,25 @@ common:
  customize-home: "Customize home layout"
  featured-notes: "Featured notes"
  dark-mode: "Dark Mode"
-  signin: "Log In"
+  signin: "Login"
  signup: "Sign up"
  signout: "Logout"
  reload-to-apply-the-setting: "You'll need to reload the page to reflect this setting. Do you want to reload it now?"
-  fetching-as-ap-object: "Inquiring to union"
+  fetching-as-ap-object: "Inquiring to fediverse"
  unfollow-confirm: "Do you want to unfollow {name}?"
+  delete-confirm: "Are you sure you want to delete this post?"
+  signin-required: "Please login"
+  notification-type: "Notification Type"
+  notification-types:
+    all: "All"
+    pollVote: "Votes"
+    follow: "Following"
+    receiveFollowRequest: "Follow requests"
+    reply: "Reply"
+    quote: "Quote"
+    renote: "Renote"
+    mention: "Mentions"
+    reaction: "Reaction"
  got-it: "Got it!"
  customization-tips:
    title: "Customization tips"
@ -81,7 +91,7 @@ common:
    "write:drive": "Work with the Drive"
    "read:favorites": "View Favorites"
    "write:favorites": "Work with Favorites"
-    "read:following": "View Follower info"
+    "read:following": "View your Follow info"
    "write:following": "Work with Follow info"
    "read:messaging": "View Messaging"
    "write:messaging": "Work with Messaging"
@ -93,6 +103,12 @@ common:
    "read:reactions": "View reactions"
    "write:reactions": "Work with reactions"
    "write:votes": "Vote"
+    "read:pages": "View Pages"
+    "write:pages": "Update Pages"
+    "read:page-likes": "View Likes on Pages"
+    "write:page-likes": "Update Likes on Pages"
+    "read:user-groups": "View User groups"
+    "write:user-groups": "Edit User groups"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
    explore: "Find users"
@ -120,6 +136,7 @@ common:
    geolocation-alert: "Your device does not provide location services"
    error: "Error"
    enter-username: "Please enter username"
+    specified-recipient: "Recipient"
    add-visible-user: "Add a user"
    cw-placeholder: "Comments for the post (optional)"
    username-prompt: "Please enter username"
@ -183,6 +200,8 @@ common:
    other: "Other"
    appearance: "Appearance"
    behavior: "Behavior"
+    reactions: "Reaction"
+    reactions-description: "Customize Emojis of Reaction picker delimited by line breaks"
    fetch-on-scroll: "Endless loading on scroll"
    fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
    note-visibility: "Post visibility"
@ -202,6 +221,7 @@ common:
    use-avatar-reversi-stones: "Use avatar as a stone in reversi"
    disable-animated-mfm: "Disable animated texts in a post"
    disable-showing-animated-images: "Do not play animated images"
+    enable-quick-notification-view: "Enable Quick Notification View"
    suggest-recent-hashtags: "Show recent popular hashtags on the post form"
    always-show-nsfw: "Always show NSFW contents"
    always-mark-nsfw: "Always mark posts with media attachments as NSFW"
@ -232,7 +252,7 @@ common:
    deck-column-width-wide: "Wide"
    use-shadow: "Use shadows in the UI"
    rounded-corners: "Round the corners of the UI"
-    circle-icons: "Use circular icons"
+    circle-icons: "Use circular avatar icon"
    contrasted-acct: "Add contrast to user account"
    wallpaper: "Background image"
    choose-wallpaper: "Choose a background"
@ -282,6 +302,16 @@ common:
    saved: "Saved"
    home-profile: "Home profile"
    deck-profile: "Deck profile"
+    room: "Room"
+    _room:
+      graphicsQuality: "Graphics Quality"
+      _graphicsQuality:
+        ultra: "Ultra"
+        high: "High"
+        medium: "Medium"
+        low: "Low"
+        cheep: "Cheep"
+      useOrthographicCamera: "Use Orthographic Camera"
  search: "Search"
  delete: "Delete"
  loading: "Loading"
@ -366,6 +396,9 @@ common/views/pages/explore.vue:
  federated: "From the fediverse"
  explore: "Explore {host}"
  users-info: "Currently, {users} users are registered here"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} reacted with {reaction}"
+  many-users: "{users}, and {omitted} more reacted with {reaction}"
 common/views/components/url-preview.vue:
  enable-player: "Enable playback"
  disable-player: "Close the player"
@ -531,6 +564,8 @@ common/views/components/note-menu.vue:
  unpin: "Unpin"
  delete: "Delete"
  delete-confirm: "Are you sure you want to delete this post?"
+  delete-and-edit: "Delete and Edit"
+  delete-and-edit-confirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
  remote: "Show original note"
  pin-limit-exceeded: "You can't pin any more posts."
 common/views/components/user-menu.vue:
@ -618,7 +653,7 @@ common/views/components/signin.vue:
  signin-with-twitter: "Log in with Twitter"
  signin-with-github: "Sign in with GitHub"
  signin-with-discord: "Sign in with Discord"
-  login-failed: "Logging in has failed. Make sure you have entered the correct username and password."
+  login-failed: "Unable to log in. The username or password you entered is incorrect."
  tap-key: "Click on the Security Key to log in"
  enter-2fa-code: "Enter your verification code"
 common/views/components/signup.vue:
@ -726,8 +761,8 @@ common/views/components/profile-editor.vue:
  uploading: "Uploading"
  upload-failed: "Failed to upload"
  unable-to-process: "The operation could not be completed."
-  avatar-not-an-image: "The file specified as an avatar is not an image"
-  banner-not-an-image: "The file specified as a banner is not an image"
+  avatar-not-an-image: "The file you specified as an avatar is not an image"
+  banner-not-an-image: "The file you specified as a banner is not an image"
  email: "Email settings"
  email-address: "Email Address"
  email-verified: "Your email has been verified."
@ -788,6 +823,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "No announcements"
  have-a-nice-day: "Have a nice day!"
  next: "Next"
+  prev: "Previous"
 common/views/widgets/calendar.vue:
  year: "Year {}"
  month: "{},"
@ -901,7 +937,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "Copy URL"
    download: "Download"
    else-files: "Other"
-    set-as-avatar: "Set as an avatar"
+    set-as-avatar: "Set as avatar"
    set-as-banner: "Set as a banner"
    open-in-app: "Open in app"
    add-app: "Add app"
@ -1119,6 +1155,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "Groups"
  follow-requests: "Follow requests"
  admin: "Admin"
+  room: "Room"
 desktop/views/components/ui.header.nav.vue:
  game: "Games"
 desktop/views/components/ui.header.notifications.vue:
@ -1265,7 +1302,7 @@ admin/views/instance.vue:
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "Proxy account"
-  proxy-account-info: "Proxy account can follow a remote user to deliver activities if no one in this instance follow him or her. When you add a remote user who is followed by nobody in this instance to your list, in order to get his or her data, proxy account follow him or her instead of your following."
+  proxy-account-info: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the activity will not be delivered to the server if no one is following that user, so the proxy account will follow instead."
  proxy-account-username: "Proxy account user name"
  proxy-account-username-desc: "Specify the user name of the account that is used as a proxy."
  proxy-account-warn: "You must make an account having this username before this action."
@ -1385,6 +1422,7 @@ admin/views/users.vue:
    state:
      title: "Sort"
      all: "All"
+      available: "Available"
      admin: "Administrator"
      moderator: "Moderator"
      adminOrModerator: "Admin/Moderator"
@ -1698,6 +1736,8 @@ mobile/views/pages/search.vue:
  not-found: "No posts were found for '{q}'"
 mobile/views/pages/selectdrive.vue:
  select-file: "Choose files"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
  signed-in-as: "Signed in as {}"
 mobile/views/pages/user.vue:
@ -1788,6 +1828,9 @@ pages:
  read-page: "Viewing the source"
  page-created: "Created the page!"
  page-updated: "Updated the page"
+  name-already-exists: "The specified page name already exists"
+  title-invalid-name: "The specified page URL is invalid"
+  text-invalid-name: "Check whether that is not a blank"
  are-you-sure-delete: "Do you want to delete this page?"
  page-deleted: "The page has been deleted"
  edit-this-page: "Edit this page"
@ -2056,3 +2099,64 @@ pages:
    enviromentVariables: "Environment variable"
    pageVariables: "Page element"
    argVariables: "Input slot"
+room:
+  add-furniture: "Place furniture"
+  translate: "Move"
+  rotate: "Rotate"
+  exit: "Deselect"
+  remove: "Remove"
+  save: "Save"
+  saved: "Saved"
+  clear: "Remove All"
+  clear-confirm: "Are you sure to remove all furnitures in your room?"
+  leave-confirm: "There are unsaved changes. Do you really want to leave?"
+  chooseImage: "Select an image"
+  room-type: "Room type"
+  carpet-color: "Color of carpet"
+  rooms:
+    default: "Default"
+    washitsu: "Japanese-style"
+  furnitures:
+    milk: "Milk carton"
+    bed: "Bed"
+    low-table: "Low Table"
+    desk: "Desk"
+    chair: "Chair"
+    chair2: "Chair 2"
+    fan: "Fan"
+    pc: "Computer"
+    plant: "Houseplant"
+    plant2: "Houseplant 2"
+    eraser: "Eraser"
+    pencil: "Pencil"
+    pudding: "Pudding"
+    cardboard-box: "Cardboard Box"
+    cardboard-box2: "Cardboard Box 2"
+    cardboard-box3: "Cardboard Box 3"
+    book: "Book"
+    book2: "Book 2"
+    piano: "Piano"
+    facial-tissue: "Facial tissue"
+    server: "Servers"
+    moon: "Moon"
+    corkboard: "Cork board"
+    mousepad: "Mousepad"
+    monitor: "Monitor"
+    keyboard: "Keyboard"
+    carpet-stripe: "Carpet (stripe)"
+    mat: "Mat"
+    color-box: "Bookshelf"
+    wall-clock: "Wall clock"
+    photoframe: "Picture frame"
+    cube: "Cube"
+    tv: "TV"
+    pinguin: "Penguin"
+    rubik-cube: "Rubik's Cube"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertical)"
+    sofa: "Sofa"
+    spiral: "Spiral Staircase"
+    bin: "Waste bin"
+    cup-noodle: "Cup noodle"
+    holo-display: "Holographic display"
+    energy-drink: "Energy drink"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -16,9 +16,6 @@ common:
    ui: "Interfaz"
    ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
    drive: "Drive"
-  adblock:
-    detected: "Por favor, desactive el bloqueador de publicidad."
-    warning: "<strong>Misskey no tiene anuncios publicitarios.</strong> Sin embargo, algunas características podrían no estar disponibles si el bloqueador de publicidad está habilitado."
  application-authorization: "Autorizaciones de la aplicación."
  close: "Cerrar"
  do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
@ -31,6 +28,11 @@ common:
  signin: "Iniciar sesión"
  signup: "¡Regístrate!"
  signout: "Cerrar sesión"
+  delete-confirm: "¿Seguro que quieres borrar la publicación?"
+  notification-types:
+    all: "Todo"
+    reply: "Responder"
+    renote: "Volver a publicar"
  got-it: "¡Listo!"
  customization-tips:
    title: "Consejos de personalización"
@ -172,7 +174,7 @@ common:
    deck-column-width-wide: "Ancho"
    use-shadow: "Usar sombras en la Interfaz de Usuario"
    rounded-corners: "Esquinas redondeadas en la Interfaz de Usuario"
-    circle-icons: "Usar iconos circulares"
+    circle-icons: "Usar avatar circulares"
    contrasted-acct: "Añadir contraste al nombre de usuario"
    wallpaper: "Fondo de pantalla"
    choose-wallpaper: "Escoge un fondo de pantalla"
@ -1089,6 +1091,8 @@ mobile/views/pages/games/reversi.vue:
  reversi: "Reversi"
 mobile/views/pages/search.vue:
  search: "Buscar"
+mobile/views/pages/notifications.vue:
+  notifications: "Notificaciones"
 mobile/views/pages/user/home.vue:
  activity: "Actividad"
 mobile/views/pages/user/home.photos.vue:
@ -1128,3 +1132,9 @@ pages:
        arg1: "Listas"
    types:
      array: "Listas"
+room:
+  save: "Guardar"
+  saved: "Guardado"
+  furnitures:
+    moon: "Luna"
+    bin: "Papelera"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Vous voulez poster une photo que vous avez déjà transférée ? Vous souhaitez organiser, nommer et créer un dossier pour vos fichiers téléversés ? Misskey Drive est la meilleure solution pour vous. Très facile de partager vos fichiers en ligne."
    outro: "Découvrez vous-même les fonctionnalités de Misskey. Étant donné que Misskey est un réseau social fédéré, vous pouvez essayer d’autres instances afin de trouver vos amis si la présente instance ne vous correspond pas. Bonne chance et amusez-vous bien !"
-  adblock:
-    detected: "Veuillez désactiver votre bloqueur de publicités"
-    warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
  application-authorization: "Autorisations de l’application"
  close: "Fermer"
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte pourrait être compromis."
@ -35,6 +32,19 @@ common:
  signout: "Se déconnecter"
  reload-to-apply-the-setting: "Le rechargement de la page est nécessaire pour appliquer ces paramètres. Désirez-vous la recharger maintenant ?"
  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
+  delete-confirm: "Supprimer cette publication ?"
+  signin-required: "Veuillez vous connecter"
+  notification-type: "Type de notifications"
+  notification-types:
+    all: "Tout"
+    pollVote: "Sondages"
+    follow: "Abonnements"
+    receiveFollowRequest: "Demandes d’abonnements"
+    reply: "Réponses"
+    quote: "Cité par"
+    renote: "Partages"
+    mention: "Mentions"
+    reaction: "Réactions"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@ -89,6 +99,7 @@ common:
    "read:reactions": "Lire les réactions"
    "write:reactions": "Gérer vos réactions"
    "write:votes": "Vote"
+    "read:pages": "Afficher la page"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Les utilisateur·rice·s suivant·e·s afficheront leurs publications sur votre fil."
    explore: "Trouver des utilisateur·rice·s"
@ -118,6 +129,7 @@ common:
    add-visible-user: "Ajouter un utilisateur"
    cw-placeholder: "Commenter le contenu (optionnel)"
    username-prompt: "Saisir un nom d'utilisateur"
+    enter-file-name: "Éditer le nom du fichier"
  weekday-short:
    sunday: "D"
    monday: "L"
@ -169,7 +181,7 @@ common:
    notification: "Notifications"
    apps: "Applications"
    tags: "Hashtags"
-    mute-and-block: "Silencés / Bloqués"
+    mute-and-block: "Masqués / Bloqués"
    blocking: "En cours blocage"
    security: "Sécurité"
    signin: "Historique des connexions"
@ -177,6 +189,7 @@ common:
    other: "Avancé"
    appearance: "Apparence"
    behavior: "Comportement"
+    reactions: "Réaction"
    fetch-on-scroll: "Chargement automatique lors du défilement"
    fetch-on-scroll-desc: "Chargement automatique du contenu lors du défilement de la page."
    note-visibility: "Visibilité de la publication"
@ -184,6 +197,8 @@ common:
    remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
    web-search-engine: "Moteur de recherche Web"
    web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
+    paste: "Coller"
+    pasted-file-name-desc: "Exemple : \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
    keep-cw: "Maintenir l'avertissement de contenu"
    keep-cw-desc: "Lorsque vous répondez à un message, le même avertissement de contenu est reprit par défaut dans la réponse, le même que celui qui a été défini dans le message original."
    i-like-sushi: "Je préfère les sushis plutôt que le pudding"
@ -221,7 +236,7 @@ common:
    deck-column-width-wide: "Large"
    use-shadow: "Utiliser les ombres dans l'interface utilisateur"
    rounded-corners: "Coins arrondis de l'interface utilisateur"
-    circle-icons: "Utiliser des icônes circulaires"
+    circle-icons: "Utiliser des avatar circulaires"
    contrasted-acct: "Ajouter du contraste au nom de l’utilisateur"
    wallpaper: "Image du fond d'écran"
    choose-wallpaper: "Sélectionner un fond d'écran"
@ -269,6 +284,18 @@ common:
    sync: "Synchroniser"
    save: "Enregistrer"
    saved: "enregistré"
+    home-profile: "Profil principal"
+    deck-profile: "Profil deck"
+    room: "Pièce"
+    _room:
+      graphicsQuality: "Qualité des graphismes"
+      _graphicsQuality:
+        ultra: "Très élevée"
+        high: "Élevée"
+        medium: "Moyenne"
+        low: "Basse"
+        cheep: "Minimale"
+      useOrthographicCamera: "Utiliser une caméra orthographique"
  search: "Recherche"
  delete: "Supprimer"
  loading: "Chargement en cours …"
@ -353,6 +380,8 @@ common/views/pages/explore.vue:
  federated: "Du Fédiverse"
  explore: "Explorer {host}"
  users-info: "Actuellement, {users} utilisateur·rice·s se sont inscrit ici"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} ont réagit avec {reaction}"
 common/views/components/url-preview.vue:
  enable-player: "Activer la lecture"
  disable-player: "Fermer le lecteur"
@ -390,6 +419,7 @@ common/views/components/games/reversi/reversi.room.vue:
  black-or-white: "Noirs/Blancs"
  black-is: "{} Noirs"
  rules: "Règles"
+  is-llotheo: "Celui ou celle qui a le moins de pièces gagne (Llotheo)"
  looped-map: "Carte en boucle"
  can-put-everywhere: "Peut poser partout"
  settings-of-the-bot: "Configuration du bot"
@ -517,7 +547,9 @@ common/views/components/note-menu.vue:
  unpin: "Désépingler"
  delete: "Supprimer"
  delete-confirm: "Supprimer cette publication ?"
+  delete-and-edit: "Supprimer et réécrire"
  remote: "Afficher la note originale"
+  pin-limit-exceeded: "Vous ne pouvez plus épingler davantage de publications."
 common/views/components/user-menu.vue:
  mention: "Mention"
  mute: "Silencier"
@ -557,6 +589,7 @@ common/views/components/poll-editor.vue:
  remove: "Supprimer ce choix"
  add: "+ Ajouter un choix"
  destroy: "Annuler ce sondage"
+  multiple: "Autoriser le multi-choix"
  expiration: "Valide jusqu'à"
  infinite: "Illimité"
  at: "Choisir une date et une durée"
@ -570,7 +603,7 @@ common/views/components/poll-editor.vue:
  hour: "Heures"
  day: "D"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choisissez votre réaction"
+  choose-reaction: "Envoyer une réaction"
  input-reaction-placeholder: "ou insérez un émoji"
 common/views/components/emoji-picker.vue:
  custom-emoji: "Émoji personnalisé"
@ -584,6 +617,7 @@ common/views/components/emoji-picker.vue:
  flags: "Drapeaux"
 common/views/components/settings/app-type.vue:
  title: "Mode"
+  intro: "Vous pouvez choisir, si vous voulez utiliser la disposition de bureau ou mobile."
  choices:
    auto: "Choisir la disposition automatiquement"
    desktop: "Toujours utiliser la disposition de bureau"
@ -706,6 +740,8 @@ common/views/components/profile-editor.vue:
  uploading: "En cours d’envoi …"
  upload-failed: "Échec de l'envoi"
  unable-to-process: "L'opération n'a pas pu être complétée"
+  avatar-not-an-image: "Le fichier sélectionné pour votre avatar n'est pas une image"
+  banner-not-an-image: "Le fichier sélectionné pour votre bannière n'est pas une image"
  email: "Paramètres de messagerie"
  email-address: "Adresse de courrier électronique"
  email-verified: "L’adresse du courrier électronique a été vérifiée."
@ -725,6 +761,8 @@ common/views/components/profile-editor.vue:
  danger-zone: "Zone de danger"
  delete-account: "Supprimer le compte"
  account-deleted: "Le compte a été supprimé. Cela peut prendre un certain temps avant que toutes les données disparaissent."
+  profile-metadata: "Métadonnées du profil"
+  metadata-label: "Étiquette"
  metadata-content: "Contenu"
 common/views/components/user-list-editor.vue:
  users: "Utilisateur·rice"
@ -885,9 +923,12 @@ desktop/views/components/drive.file.vue:
    copied: "Copié"
    copied-url-to-clipboard: "L'URL a été copiée dans le presse-papier"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Emplacement de téléversement par défaut"
  unable-to-process: "L'opération n'a pas pu être complétée"
  circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
  unhandled-error: "Erreur inconnue"
+  unable-to-delete: "Ne peut pas être supprimé"
+  has-child-files-or-folders: "Ce dossier n'est pas vide, il ne peut pas être supprimé"
  contextmenu:
    move-to-this-folder: "Déplacer dans ce dossier"
    show-in-new-window: "Ouvrir dans une nouvelle fenêtre"
@ -940,8 +981,8 @@ desktop/views/components/note-detail.vue:
  deleted: "cette publication a été supprimée"
  location: "Géolocalisation"
  renote: "Republier"
-  add-reaction: "Ajouter votre reaction"
-  undo-reaction: "Inverser la réaction"
+  add-reaction: "Ajouter une réaction"
+  undo-reaction: "Annuler la réaction"
 desktop/views/components/note.vue:
  reply: "Répondre"
  renote: "Partager"
@ -1001,6 +1042,7 @@ desktop/views/components/settings.2fa.vue:
  success: "Sauvegarde des paramètres avec succès !"
  failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
  info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
+  totp-header: "Application d'authentification"
  security-key-header: "Clé de sécurité"
  last-used: "Dernière utilisation :"
  activate-key: "Cliquez pour activer la clé de sécurité"
@ -1032,12 +1074,13 @@ common/views/components/drive-settings.vue:
  max: "Maximale"
  in-use: "utilisé"
  stats: "Statistiques"
+  default-upload-folder: "Emplacement par défaut du dossier de transfert"
  default-upload-folder-name: "Dossier·s"
  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "Silencés / Bloqués"
-  mute: "Mettre en sourdine"
-  block: "En cours blocage"
+  mute-and-block: "Masqués / Bloqués"
+  mute: "Mis en sourdine"
+  block: "Vous avez bloqué"
  no-muted-users: "Aucun utilisateur n’est mis en sourdine"
  no-blocked-users: "Aucun utilisateur n’est bloqué"
  word-mute: "Filtre de mots"
@ -1087,6 +1130,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "Groupes"
  follow-requests: "Demandes d’abonnement"
  admin: "Admin"
+  room: "Pièce"
 desktop/views/components/ui.header.nav.vue:
  game: "Jeux"
 desktop/views/components/ui.header.notifications.vue:
@ -1140,11 +1184,13 @@ admin/views/queue.vue:
    deliver: "Délivrées"
    inbox: "Reçues"
    db: "Base de données"
+    objectStorage: "Stockage d'objets"
  state: "État"
  states:
    active: "en cours"
    delayed: "Programmé"
    waiting: "En file d'attente"
+  result-is-truncated: "Le résultat est tronqué"
  other-queues: "Autres files d’attente"
 admin/views/logs.vue:
  logs: "Journaux"
@ -1177,12 +1223,14 @@ admin/views/instance.vue:
  languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces."
  tos-url: "URL des conditions d'utilisation"
  repository-url: "URL du dépôt"
+  feedback-url: "URL pour les commentaires"
  maintainer-config: "Informations de l’administrateur"
  maintainer-name: "Nom de l’administrateur"
  maintainer-email: "Contact administratif"
  advanced-config: "Autres réglages"
  note-and-tl: "Notes et fils"
  drive-config: "Paramètres du lecteur"
+  use-object-storage: "Utiliser le stockage d'objets"
  object-storage-base-url: "URL"
  object-storage-prefix: "Préfixe"
  object-storage-endpoint: "Point de terminaison"
@ -1337,6 +1385,7 @@ admin/views/users.vue:
    state:
      title: "État"
      all: "Tout"
+      available: "Disponible"
      admin: "Admin"
      moderator: "Modérateur"
      adminOrModerator: "Administrateur/Modérateur"
@ -1360,6 +1409,7 @@ admin/views/moderators.vue:
    title: "Journaux"
    moderator: "Modérateurs"
    type: "Actions"
+    at: "Date de modification"
    info: "Informations"
 admin/views/emoji.vue:
  add-emoji:
@ -1637,6 +1687,8 @@ mobile/views/pages/search.vue:
  not-found: "Aucune publication trouvée pour « {q} »."
 mobile/views/pages/selectdrive.vue:
  select-file: "Choisissez un fichier"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
  signed-in-as: "Connecté·e en tant que {}"
 mobile/views/pages/user.vue:
@ -1727,6 +1779,8 @@ pages:
  read-page: "Voir la source"
  page-created: "Page a été créée !"
  page-updated: "A mis à jour la page"
+  name-already-exists: "Une page portant le même nom existe déjà"
+  title-invalid-name: "L’URL de la page spécifiée n’est pas valide"
  are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
  page-deleted: "La page a bien été supprimée."
  edit-this-page: "Éditer cette page"
@ -1735,6 +1789,7 @@ pages:
  view-source: "Afficher la source"
  view-page: "Afficher la page"
  like: "Bien"
+  unlike: "Je n’aime pas"
  liked-pages: "Pages favorites"
  my-pages: "Mes pages"
  inspector: "Inspecteur"
@ -1964,3 +2019,61 @@ pages:
    emptySlot: "Slot vide"
    enviromentVariables: "Variables d'environnement"
    pageVariables: "Élément de page"
+room:
+  add-furniture: "Placer des meubles"
+  translate: "Déplacer"
+  rotate: "Tourner"
+  remove: "Enlever"
+  save: "Enregistrer"
+  saved: "enregistré"
+  clear: "Tout enlever"
+  clear-confirm: "Désirez-vous enlever tout les meubles de votre chambre ?"
+  leave-confirm: "Vous avez des modifications non-sauvegardées. Voulez-vous vraiment quitter ?"
+  chooseImage: "Sélectionnez une image"
+  room-type: "Type de chambre"
+  carpet-color: "Couleur du tapis"
+  rooms:
+    default: "Par défaut"
+    washitsu: "Style japonnais"
+  furnitures:
+    milk: "Lait en carton"
+    bed: "Lit"
+    low-table: "Table basse"
+    desk: "Bureau"
+    chair: "Chaise"
+    chair2: "Chaise 2"
+    fan: "Ventilateur"
+    pc: "Ordinateur"
+    plant: "Plante d’intérieur"
+    plant2: "Plante d’intérieur 2"
+    eraser: "Gomme"
+    pencil: "Crayon"
+    cardboard-box: "Boîte en carton"
+    cardboard-box2: "Boîte en carton 2"
+    cardboard-box3: "Boîte en carton 3"
+    book: "Livre"
+    book2: "Livre 2"
+    piano: "Piano"
+    facial-tissue: "Mouchoirs en papier"
+    server: "Serveurs"
+    moon: "Lune"
+    corkboard: "Tableau en liège"
+    mousepad: "Tapis de souris"
+    monitor: "Écran"
+    keyboard: "Clavier"
+    carpet-stripe: "Tapis (zébré)"
+    color-box: "Étagère"
+    wall-clock: "Horloge murale"
+    photoframe: "Cadre photo"
+    cube: "Cube"
+    tv: "Téléviseur"
+    pinguin: "Pingouin"
+    rubik-cube: "Cube de Rubik"
+    poster-h: "Affiche (horizontale)"
+    poster-v: "Affiche (verticale)"
+    sofa: "Canapé"
+    spiral: "Escaliers en spirale"
+    bin: "Corbeille"
+    cup-noodle: "Bol de nouilles"
+    holo-display: "Affichage holographique"
+    energy-drink: "Boisson énergétique"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -19,9 +19,6 @@ common:
    drive: "ドライブ"
    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
-  adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
  application-authorization: "アプリの連携"
  close: "閉じる"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
@ -37,6 +34,19 @@ common:
  reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
  fetching-as-ap-object: "連合に照会中"
  unfollow-confirm: "{name}さんをフォロー解除しますか？"
+  delete-confirm: "この投稿を削除しますか？"
+  signin-required: "ログインしてください"
+  notification-type: "通知の種類"
+  notification-types:
+    all: "すべて"
+    pollVote: "投票"
+    follow: "フォロー"
+    receiveFollowRequest: "フォローリクエスト"
+    reply: "返信"
+    quote: "引用"
+    renote: "Renote"
+    mention: "言及"
+    reaction: "リアクション"

  got-it: "わかった"
  customization-tips:
@ -97,6 +107,12 @@ common:
    "read:reactions": "リアクションを見る"
    "write:reactions": "リアクションを操作する"
    "write:votes": "投票する"
+    "read:pages": "ページを見る"
+    "write:pages": "ページを操作する"
+    "read:page-likes": "ページのいいねを見る"
+    "write:page-likes": "ページのいいねを操作する"
+    "read:user-groups": "ユーザーグループを見る"
+    "write:user-groups": "ユーザーグループを操作する"

  empty-timeline-info:
    follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
@ -126,6 +142,7 @@ common:
    geolocation-alert: "お使いの端末は位置情報に対応していません"
    error: "エラー"
    enter-username: "ユーザー名を入力してください"
+    specified-recipient: "宛先"
    add-visible-user: "ユーザーを追加"
    cw-placeholder: "内容への注釈 (オプション)"
    username-prompt: "ユーザー名を入力してください"
@ -195,6 +212,8 @@ common:
    other: "その他"
    appearance: "デザイン"
    behavior: "動作"
+    reactions: "リアクション"
+    reactions-description: "リアクションピッカーに表示するリアクションを改行で区切って設定します。"
    fetch-on-scroll: "スクロールで自動読み込み"
    fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
    note-visibility: "投稿の公開範囲"
@ -214,6 +233,7 @@ common:
    use-avatar-reversi-stones: "リバーシの石にアバターを使う"
    disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
    disable-showing-animated-images: "アニメーション画像を再生しない"
+    enable-quick-notification-view: "通知のクイックビューを有効にする"
    suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
    always-show-nsfw: "常に閲覧注意のメディアを表示する"
    always-mark-nsfw: "常にメディアを閲覧注意として投稿"
@ -244,7 +264,7 @@ common:
    deck-column-width-wide: "広"
    use-shadow: "UIに影を使用"
    rounded-corners: "UIの角を丸める"
-    circle-icons: "円形のアイコンを使用"
+    circle-icons: "円形のアバターを使用"
    contrasted-acct: "ユーザー名にコントラストを付ける"
    wallpaper: "壁紙"
    choose-wallpaper: "壁紙を選択"
@ -294,6 +314,16 @@ common:
    saved: "保存しました"
    home-profile: "ホームのプロファイル"
    deck-profile: "デッキのプロファイル"
+    room: "ルーム"
+    _room:
+      graphicsQuality: "グラフィックの品質"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "平行投影カメラを使用"

  search: "検索"
  delete: "削除"
@ -383,11 +413,17 @@ common/views/pages/explore.vue:
  popular-users: "人気のユーザー"
  recently-updated-users: "最近投稿したユーザー"
  recently-registered-users: "新規ユーザー"
+  recently-discovered-users: "最近発見されたユーザー"
  popular-tags: "人気のタグ"
  federated: "連合"
  explore: "{host}を探索"
+  explore-fediverse: "Fediverseを探索"
  users-info: "現在{users}ユーザーが登録されています"

+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}が{reaction}をリアクション"
+  many-users: "{users}と他{omitted}人が{reaction}をリアクション"
+
 common/views/components/url-preview.vue:
  enable-player: "プレイヤーを開く"
  disable-player: "プレイヤーを閉じる"
@ -569,6 +605,8 @@ common/views/components/note-menu.vue:
  unpin: "ピン留め解除"
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
+  delete-and-edit: "削除して編集"
+  delete-and-edit-confirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、Renote、返信も全て削除されます。"
  remote: "投稿元で見る"
  pin-limit-exceeded: "これ以上ピン留めできません。"

@ -769,7 +807,7 @@ common/views/components/profile-editor.vue:
  you-can-include-hashtags: "ハッシュタグを含めることができます。"
  language: "言語"
  birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-bot: "このアカウントはBotです"
@ -783,7 +821,7 @@ common/views/components/profile-editor.vue:
  uploading: "アップロード中"
  upload-failed: "アップロードに失敗しました"
  unable-to-process: "操作を完了できません"
-  avatar-not-an-image: "アイコンとして指定したファイルは画像ではありません"
+  avatar-not-an-image: "アバターとして指定したファイルは画像ではありません"
  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
  email: "メール設定"
  email-address: "メールアドレス"
@ -850,6 +888,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "お知らせはありません"
  have-a-nice-day: "良い一日を！"
  next: "次"
+  prev: "前"

 common/views/widgets/calendar.vue:
  year: "{}年"
@ -973,7 +1012,7 @@ desktop/views/components/drive-window.vue:
  used: "使用中"

 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  nsfw: "閲覧注意"
  contextmenu:
@ -983,7 +1022,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "URLをコピー"
    download: "ダウンロード"
    else-files: "その他"
-    set-as-avatar: "アイコンに設定"
+    set-as-avatar: "アバターに設定"
    set-as-banner: "バナーに設定"
    open-in-app: "アプリで開く"
    add-app: "アプリを追加"
@ -1234,6 +1273,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "グループ"
  follow-requests: "フォロー申請"
  admin: "管理"
+  room: "ルーム"

 desktop/views/components/ui.header.nav.vue:
  game: "ゲーム"
@ -1518,6 +1558,7 @@ admin/views/users.vue:
    state:
      title: "状態"
      all: "すべて"
+      available: "利用可能"
      admin: "管理者"
      moderator: "モデレーター"
      adminOrModerator: "管理者+モデレーター"
@ -1883,6 +1924,9 @@ mobile/views/pages/search.vue:
 mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"

+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"

@ -1984,6 +2028,9 @@ pages:
  read-page: "ソースを表示中"
  page-created: "ページを作成しました"
  page-updated: "ページを更新しました"
+  name-already-exists: "指定されたページURLは既に存在しています"
+  title-invalid-name: "不正なページURLです"
+  text-invalid-name: "空白でないか確認してください"
  are-you-sure-delete: "このページを削除しますか？"
  page-deleted: "ページを削除しました"
  edit-this-page: "このページを編集"
@ -2262,3 +2309,65 @@ pages:
    enviromentVariables: "環境変数"
    pageVariables: "ページ要素"
    argVariables: "入力スロット"
+
+room:
+  add-furniture: "家具を置く"
+  translate: "移動"
+  rotate: "回転"
+  exit: "戻る"
+  remove: "しまう"
+  save: "保存"
+  saved: "保存しました"
+  clear: "片付け"
+  clear-confirm: "全ての家具をしまいますか？"
+  leave-confirm: "未保存の変更があります、移動しますか？"
+  chooseImage: "画像を選択"
+  room-type: "部屋のタイプ"
+  carpet-color: "床の色"
+  rooms:
+    default: "デフォルト"
+    washitsu: "和室"
+  furnitures:
+    milk: "牛乳パック"
+    bed: "ベッド"
+    low-table: "ローテーブル"
+    desk: "デスク"
+    chair: "チェア"
+    chair2: "チェア2"
+    fan: "換気扇"
+    pc: "パソコン"
+    plant: "観葉植物"
+    plant2: "観葉植物2"
+    eraser: "消しゴム"
+    pencil: "鉛筆"
+    pudding: "プリン"
+    cardboard-box: "段ボール箱"
+    cardboard-box2: "段ボール箱2"
+    cardboard-box3: "段ボール箱3"
+    book: "本"
+    book2: "本2"
+    piano: "ピアノ"
+    facial-tissue: "ティッシュボックス"
+    server: "サーバー"
+    moon: "月"
+    corkboard: "コルクボード"
+    mousepad: "マウスパッド"
+    monitor: "モニター"
+    keyboard: "キーボード"
+    carpet-stripe: "カーペット(縞)"
+    mat: "マット"
+    color-box: "カラーボックス"
+    wall-clock: "壁掛け時計"
+    photoframe: "額縁"
+    cube: "キューブ"
+    tv: "テレビ"
+    pinguin: "ピンギン"
+    rubik-cube: "ルービックキューブ"
+    poster-h: "ポスター(横長)"
+    poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
+    bin: "ゴミ箱"
+    cup-noodle: "カップ麺"
+    holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -18,15 +18,19 @@ common:
    drive: "ドライブ"
    drive-desc: "「こないだの画像、どこやったかな……また投稿したいんやけど……」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
    outro: "Misskeyの機能は無限大や！知らんけど。知らん言うとるやんけ、あんたが見に行けや！Misskeyは分散型SNSやから、ここがあかんくても他がある。阪神でもオリックスでもワイは応援するで！"
-  adblock:
-    detected: "広告ブロッカーを無効にしてや"
-    warning: "<strong>Misskeyは広告を掲載してへん</strong>けど、広告をブロックしはる機能がおると一部の機能が利用できんくなったり、不具合が発生するかも分からん。知らんけど。"
  application-authorization: "アプリの連携"
  close: "さいなら"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
  load-more: "もっとあらへんのか！"
  enter-password: "パスワードを入れてや"
  2fa: "二段階認証"
+  delete-confirm: "この投稿を削除してもええか？"
+  notification-types:
+    all: "すべて"
+    follow: "フォロー"
+    reply: "返す"
+    renote: "Renote"
+    reaction: "リアクション"
  got-it: "ほい"
  customization-tips:
    title: "カスタマイズのヒント"
@ -122,6 +126,7 @@ common:
    blocking: "ブロック"
    password: "パスワード"
    other: "その他"
+    reactions: "リアクション"
    timeline: "タイムライン"
    save: "保存"
    saved: "保存したで！"
@ -460,7 +465,7 @@ common/views/components/profile-editor.vue:
  description: "自己紹介"
  language: "言語"
  birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  is-cat: "このアカウントはCatやで"
  is-bot: "このアカウントはBotやで"
@ -598,7 +603,7 @@ desktop/views/components/crop-window.vue:
 desktop/views/components/drive-window.vue:
  used: "使うとる"
 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  nsfw: "見たらあかんで"
  contextmenu:
@ -608,7 +613,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "URLをコピー"
    download: "ダウンロード"
    else-files: "その他"
-    set-as-avatar: "アイコンにする"
+    set-as-avatar: "アバターにする"
    set-as-banner: "バナーにする"
    open-in-app: "アプリで開く"
    add-app: "アプリ増やす"
@ -1176,6 +1181,8 @@ mobile/views/pages/search.vue:
  not-found: "ワイは「{q}」なんて投稿知らんわ、無いんちゃう？知らんけど。"
 mobile/views/pages/selectdrive.vue:
  select-file: "ファイル選んでや"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
 mobile/views/pages/settings.vue:
  signed-in-as: "あんたは橋の下で拾った{}や！"
 mobile/views/pages/user.vue:
@ -1275,3 +1282,10 @@ pages:
        arg1: "リスト"
    types:
      array: "リスト"
+room:
+  translate: "移動"
+  save: "保存"
+  saved: "保存したで！"
+  furnitures:
+    moon: "月"
+    bin: "ゴミ箱"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -18,9 +18,6 @@ common:
    drive: "드라이브"
    drive-desc: "이전에 올렸던 적 있는 이미지를 다시 올리고 싶을 때가 있지 않으신가요? 아니면 업로드했던 파일을 폴더로 정리하고 싶지 않으신가요? Misskey에 기본적으로 내장된 드라이브 기능으로 해결됩니다. 파일 공유도 쉽습니다."
    outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
-  adblock:
-    detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
  application-authorization: "앱 연계"
  close: "닫기"
  do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@ -36,6 +33,19 @@ common:
  reload-to-apply-the-setting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
  fetching-as-ap-object: "연합에서 조회 중"
  unfollow-confirm: "{name} 님을 팔로우 해제하시겠습니까?"
+  delete-confirm: "이 글을 삭제하시겠습니까?"
+  signin-required: "로그인 해주세요"
+  notification-type: "알림의 종류"
+  notification-types:
+    all: "모두"
+    pollVote: "투표"
+    follow: "팔로잉"
+    receiveFollowRequest: "팔로우 요청"
+    reply: "답글 달기"
+    quote: "인용"
+    renote: "리노트"
+    mention: "멘션"
+    reaction: "리액션"
  got-it: "알겠습니다"
  customization-tips:
    title: "커스터마이징 도움말"
@ -73,14 +83,14 @@ common:
  followers: "팔로워"
  favorites: "즐겨찾기"
  permissions:
-    "read:account": "계정의 정보를 볼 수 있습니다."
-    "write:account": "계정의 정보를 변경할 수 있습니다."
-    "read:blocks": "차단 목록을 볼 수 있습니다."
-    "write:blocks": "차단 목록을 조작할 수 있습니다."
-    "read:drive": "드라이브의 파일들을 볼 수 있습니다."
-    "write:drive": "드라이브의 파일들을 조작할 수 있습니다."
-    "read:favorites": "즐겨찾기 목록을 볼 수 있습니다."
-    "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다."
+    "read:account": "계정 정보 보기"
+    "write:account": "계정 정보 변경"
+    "read:blocks": "차단 보기"
+    "write:blocks": "차단 수정"
+    "read:drive": "드라이브 보기"
+    "write:drive": "드라이브 수정"
+    "read:favorites": "즐겨찾기 보기"
+    "write:favorites": "즐겨찾기 수정"
    "read:following": "팔로우 정보 보기"
    "write:following": "팔로잉, 팔로우 수정"
    "read:messaging": "대화 보기"
@ -88,11 +98,17 @@ common:
    "read:mutes": "뮤트 보기"
    "write:mutes": "뮤트 수정"
    "write:notes": "글 작성, 삭제"
-    "read:notifications": "글 보기"
+    "read:notifications": "알림 보기"
    "write:notifications": "알림 수정"
    "read:reactions": "리액션 보기"
    "write:reactions": "리액션 수정"
    "write:votes": "투표하기"
+    "read:pages": "페이지 보기"
+    "write:pages": "페이지 변경"
+    "read:page-likes": "페이지의 좋아요 보기"
+    "write:page-likes": "페이지의 좋아요 변경"
+    "read:user-groups": "유저 그룹 보기"
+    "write:user-groups": "유저 그룹을 변경"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
    explore: "사용자 탐색"
@ -120,6 +136,7 @@ common:
    geolocation-alert: "사용 중이신 장치에서는 위치 정보를 사용할 수 없습니다"
    error: "오류"
    enter-username: "사용자명을 입력해주세요"
+    specified-recipient: "수신인"
    add-visible-user: "사용자 추가"
    cw-placeholder: "내용에 대한 주석 (옵션)"
    username-prompt: "사용자명을 입력해주세요"
@ -183,6 +200,8 @@ common:
    other: "기타"
    appearance: "디자인"
    behavior: "동작"
+    reactions: "리액션"
+    reactions-description: "리액션 선택창에 표시할 리액션을 줄바꿈으로 구분해 설정합니다."
    fetch-on-scroll: "스크롤하여 자동으로 불러오기"
    fetch-on-scroll-desc: "페이지를 아래로 스크롤하였을 때 자동으로 추가 콘텐츠를 불러옵니다."
    note-visibility: "게시물의 공개 범위"
@ -202,6 +221,7 @@ common:
    use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
    disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
    disable-showing-animated-images: "움직이는 이미지를 자동으로 재생하지 않음"
+    enable-quick-notification-view: "알림의 빠른 보기를 사용합니다"
    suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
    always-show-nsfw: "항상 열람주의 미디어를 표시"
    always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
@ -232,7 +252,7 @@ common:
    deck-column-width-wide: "넓음"
    use-shadow: "UI에 그림자 효과 적용"
    rounded-corners: "UI의 모서리를 둥글게 설정"
-    circle-icons: "원형 아이콘 사용"
+    circle-icons: "원형 아바타를 사용"
    contrasted-acct: "사용자명에 대비 추가"
    wallpaper: "배경"
    choose-wallpaper: "배경 설정"
@ -282,6 +302,16 @@ common:
    saved: "저장하였습니다"
    home-profile: "홈 프로필"
    deck-profile: "덱 프로필"
+    room: "룸"
+    _room:
+      graphicsQuality: "그래픽 품질"
+      _graphicsQuality:
+        ultra: "최고"
+        high: "높음"
+        medium: "보통"
+        low: "낮음"
+        cheep: "최저"
+      useOrthographicCamera: "평행 투시 카메라를 사용"
  search: "검색"
  delete: "삭제"
  loading: "로드 중"
@ -366,6 +396,9 @@ common/views/pages/explore.vue:
  federated: "연합"
  explore: "{host}을(를) 탐색"
  users-info: "현재 {users} 사용자가 등록되어 있습니다"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}님이 {reaction} 리액션"
+  many-users: "{users}님 외 {omitted}명이 {reaction} 리액션"
 common/views/components/url-preview.vue:
  enable-player: "플레이어 열기"
  disable-player: "플레이어 닫기"
@ -531,6 +564,8 @@ common/views/components/note-menu.vue:
  unpin: "프로필에서 고정 해제"
  delete: "삭제"
  delete-confirm: "이 글을 삭제하시겠습니까?"
+  delete-and-edit: "삭제 후 편집"
+  delete-and-edit-confirm: "이 글을 삭제한 뒤 다시 편집하시겠습니까? 이 글에 대한 리액션, 리노트, 답글 또한 모두 삭제됩니다."
  remote: "글 원본 보기"
  pin-limit-exceeded: "더 이상 고정할 수 없습니다."
 common/views/components/user-menu.vue:
@ -788,6 +823,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "공지사항이 없습니다"
  have-a-nice-day: "좋은 하루 되세요!"
  next: "다음"
+  prev: "이전"
 common/views/widgets/calendar.vue:
  year: "{}년"
  month: "{}월"
@ -1119,6 +1155,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "그룹"
  follow-requests: "팔로우 요청"
  admin: "관리"
+  room: "룸"
 desktop/views/components/ui.header.nav.vue:
  game: "게임"
 desktop/views/components/ui.header.notifications.vue:
@ -1373,7 +1410,7 @@ admin/views/users.vue:
  delete-all-files: "모든 파일 삭제"
  delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
  username: "사용자명"
-  host: "관리자"
+  host: "호스트"
  users:
    title: "사용자"
    sort:
@ -1385,6 +1422,7 @@ admin/views/users.vue:
    state:
      title: "상태"
      all: "모두"
+      available: "이용 가능"
      admin: "관리자"
      moderator: "모더레이터"
      adminOrModerator: "관리자+모더레이터"
@ -1698,6 +1736,8 @@ mobile/views/pages/search.vue:
  not-found: "\"{q}\" 와 일치하는 글을 찾을 수 없습니다."
 mobile/views/pages/selectdrive.vue:
  select-file: "파일 선택"
+mobile/views/pages/notifications.vue:
+  notifications: "알림"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}(으)로 로그인"
 mobile/views/pages/user.vue:
@ -1788,6 +1828,9 @@ pages:
  read-page: "소스 표시중"
  page-created: "페이지를 만들었습니다"
  page-updated: "페이지를 수정했습니다"
+  name-already-exists: "지정한 페이지 URL은 이미 존재합니다"
+  title-invalid-name: "유효하지 않은 페이지 URL입니다"
+  text-invalid-name: "비어있지 않은지 확인해주세요"
  are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
  page-deleted: "페이지가 삭제되었습니다"
  edit-this-page: "이 페이지를 편집"
@ -2056,3 +2099,64 @@ pages:
    enviromentVariables: "환경 변수"
    pageVariables: "페이지 요소"
    argVariables: "입력 슬롯"
+room:
+  add-furniture: "가구를 배치"
+  translate: "이동"
+  rotate: "회전"
+  exit: "선택 해제"
+  remove: "치우기"
+  save: "저장"
+  saved: "저장하였습니다"
+  clear: "모두 치우기"
+  clear-confirm: "정말 방 안의 모든 가구를 치우시겠습니까?"
+  leave-confirm: "저장되지 않은 변경 사항이 있습니다. 정말 나가시겠습니까?"
+  chooseImage: "이미지 선택"
+  room-type: "룸 종류"
+  carpet-color: "바닥 색상"
+  rooms:
+    default: "기본"
+    washitsu: "일본식"
+  furnitures:
+    milk: "우유 팩"
+    bed: "침대"
+    low-table: "낮은 테이블"
+    desk: "책상"
+    chair: "의자"
+    chair2: "의자 2"
+    fan: "환기구"
+    pc: "컴퓨터"
+    plant: "관엽식물"
+    plant2: "관엽식물 2"
+    eraser: "지우개"
+    pencil: "연필"
+    pudding: "푸딩"
+    cardboard-box: "골판지 상자"
+    cardboard-box2: "골판지 상자 2"
+    cardboard-box3: "골판지 상자 3"
+    book: "책"
+    book2: "책 2"
+    piano: "피아노"
+    facial-tissue: "휴지 상자"
+    server: "서버"
+    moon: "달"
+    corkboard: "게시판"
+    mousepad: "마우스 패드"
+    monitor: "모니터"
+    keyboard: "키보드"
+    carpet-stripe: "카페트 (줄무늬)"
+    mat: "매트"
+    color-box: "책장"
+    wall-clock: "벽걸이 시계"
+    photoframe: "액자"
+    cube: "큐브"
+    tv: "TV"
+    pinguin: "펭귄"
+    rubik-cube: "루빅스 큐브"
+    poster-h: "포스터 (가로)"
+    poster-v: "포스터 (세로)"
+    sofa: "소파"
+    spiral: "나선형 계단"
+    bin: "휴지통"
+    cup-noodle: "컵라면"
+    holo-display: "홀로그램"
+    energy-drink: "에너지 드링크"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@ -3,11 +3,58 @@ meta:
  lang: "Nederlands"
 common:
  misskey: "Deel alles met anderen die ook Misskey gebruiken."
+  about-title: "Een ster van het fediverse"
+  about: "Bedankt voor het ontdekken van Misskey. Misskey is een <b>gedecentraliseerd microblogging platform</b> geboren op aarde. Omdat het bestaat binnen het Fediverse (een georganiseerd universum van verschillende sociale mediaplatformen), staat het verbonden met andere sociale medieplatformen. Neem een pauze van de stedelijke drukte, en duik in het nieuwe intenet?"
  intro:
+    title: "Wat is Misskey?"
+    about: "Misskey is een open source <b>gedecentraliseerd blogplatform</b>. Het heeft een gesofisticeerde, volledig aanpasbare gebruikersinterface, uitgebreide reactiemogelijkheden voor posts, gratis geïntegreerd bestandsoplagbeheer en andere geavanceerde mogelijkheden. Daarnaast staat Misskey verbonden aan een netwerksysteem genaam het \"Fediverse\", hiermee kunnen we communiceren met andere gebruikers op andere SNSs. Dit betekent dat wanneer je iets post het niet enkel verstuurd wordt naar andere Misskey gebruikers, maar ook naar gebruikers op Mastodon en Pleroma. Stel je voor dat een planeet een radiosignaal verzendt naar een andere planeet als manier van communiceren."
+    features: "Kenmerken"
    rich-contents: "Bericht"
+    rich-contents-desc: "Post jouw idee, hot topic, wat je ook maar wil delen. Maak jouw teksten aantrekkelijk met je favoriete foto's, verzend bestanden, zelfs video's, of maak een poll. Dit zijn enkele van de mogelijkheden die Misskey aanbiedt!"
    reaction: "Reactie"
+    reaction-desc: "Dé makkelijkste manier om jouw gevoelens uit te drukken. Met Misskey kan je verschillende reacties toevoegen aan jouw posts. Andere SNSs hebben enkel maar een \"vind ik leuk\" reactie."
+    ui: "Interface"
+    ui-desc: "Niet één UI past nij iedereen. Daarom heeft Misskey een uitgebreide keuze om de UI naar jouw hand te zetten. Je kan jouw nieuwe thuis zo origineel maken als je zelf wil door jouw tijdslijn aan te passen door widgets te verplaatsen en hun look te veranderen. Zo maak je van Misskey jouw eigen stek."
+    drive: "Drive"
+    drive-desc: "Wil je een foto posten die je reeds het geüpload? Wens je georganiseerde map met zelfgekozen naam maken voor al jouw bestanden? De beste oplossing voor jou  is Misskey Drive. Dit maakt het supermakkelijk om jouw bestanden online te delen."
+  application-authorization: "Geauthoriseerde applicaties"
  close: "Sluiten"
+  do-not-copy-paste: "Gelieve de code hier niet in te geven of te plakken. De account kan gecompromiseerd zijn."
+  load-more: "Laad meer resultaten"
  enter-password: "Voer het wachtwoord in"
+  2fa: "Tweestapsverificatie"
+  customize-home: "Layout aanpassen"
+  featured-notes: "Uitgelicht"
+  dark-mode: "Donker thema"
+  signin: "Aanmelden"
+  signup: "Registreren"
+  signout: "Afmelden"
+  reload-to-apply-the-setting: "Herlaad de pagina om je aanpassingen te bekijken. Wil je de pagina nu herladen?"
+  fetching-as-ap-object: "Verzenden naar Fediverse"
+  unfollow-confirm: "Wil stoppen met {name} te volgen?"
+  delete-confirm: "Ben je zeker dat je dit bericht wil verwijderen?"
+  signin-required: "Gelieve in te loggen"
+  notification-type: "Notificatietype"
+  notification-types:
+    all: "Alle"
+    pollVote: "Stemmen"
+    follow: "Volgend"
+    receiveFollowRequest: "Volgverzoeken"
+    reply: "Beantwoorden"
+    quote: "Bron"
+    mention: "Vermeldingen"
+    reaction: "Reactie"
+  got-it: "Ik snap het!"
+  customization-tips:
+    title: "Aanpassingstips"
+    gotit: "Ik snap het!"
+  notification:
+    file-uploaded: "Je bestand is geüpload"
+    message-from: "Bericht van {}:"
+    reversi-invited: "Uitgenodigd voor spel"
+    notified-by: "Bemerkt door: {}"
+    reply-from: "Antwoord van: {}"
+    quoted-by: "Geciteerd door: {}"
  time:
    unknown: "onbekend"
    future: "toekomstig"
@ -19,7 +66,13 @@ common:
    weeks_ago: "{}week/weken geleden"
    months_ago: "{}maand(en) geleden"
    years_ago: "{}jaar geleden"
+  month-and-day: "{day} {month}"
+  trash: "Prullenbak"
+  drive: "Drive"
+  pages: "Pagina's"
+  messaging: "Gesprekken"
  home: "Startpagina"
+  deck: "Deck"
  timeline: "Tijdlijn"
  followers: "Volgers"
  favorites: "Deze notitie toevoegen aan favorieten"
@ -54,7 +107,11 @@ common:
    profile: "Je profiel"
    notification: "Meldingen"
    password: "Wachtwoord"
+    reactions: "Reactie"
+    deck-column-align-center: "Centreren"
+    deck-column-align-left: "Links"
    timeline: "Tijdlijn"
+    navbar-position-left: "Links"
  search: "Zoeken"
  delete: "Verwijderen"
  loading: "Bezig met laden"
@ -227,6 +284,7 @@ common/views/pages/follow.vue:
  follow: "Volgend"
 desktop:
  banner: "Omslagfoto"
+  avatar: "Gebruikersafbeelding"
  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
  total: "Zwart ... totaal"
@ -417,11 +475,13 @@ admin/views/index.vue:
  users: "Gebruiker"
 admin/views/dashboard.vue:
  notes: "Bericht"
+  drive: "Drive"
 admin/views/abuse.vue:
  remove-report: "Verwijderen"
 admin/views/charts.vue:
  notes: "Bericht"
  users: "Gebruiker"
+  drive: "Drive"
 admin/views/drive.vue:
  origin:
    local: "Lokaal"
@ -557,6 +617,7 @@ mobile/views/pages/home.vue:
  global: "Algemeen"
 mobile/views/pages/widgets.vue:
  add-widget: "Toevoegen"
+  customization-tips: "Aanpassingstips"
 mobile/views/pages/widgets/activity.vue:
  activity: "Activiteit"
 mobile/views/pages/note.vue:
@ -569,6 +630,8 @@ mobile/views/pages/search.vue:
  search: "Zoeken"
 mobile/views/pages/selectdrive.vue:
  select-file: "Kies een bestand"
+mobile/views/pages/notifications.vue:
+  notifications: "Meldingen"
 mobile/views/pages/settings.vue:
  signed-in-as: "Ingelogd als {}"
 mobile/views/pages/user.vue:
@ -631,3 +694,8 @@ pages:
        arg1: "Lijsten"
    types:
      array: "Lijsten"
+room:
+  translate: "Verplaatsen"
+  furnitures:
+    moon: "Maan"
+    bin: "Prullenbak"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@ -11,6 +11,10 @@ common:
    rich-contents: "Innlegg"
    drive: "Disk"
  close: "Lukk"
+  notification-types:
+    all: "Alle"
+    follow: "Følger"
+    reply: "Svar"
  got-it: "Skjønner!"
  notification:
    file-uploaded: "Filen ble lastet opp!"
@ -467,6 +471,8 @@ mobile/views/pages/games/reversi.vue:
  reversi: "Reversi"
 mobile/views/pages/search.vue:
  search: "Søk"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifikasjon"
 mobile/views/pages/user.vue:
  following: "Følger"
  followers: "Følgere"
@ -514,3 +520,9 @@ pages:
        arg1: "Lister"
    types:
      array: "Lister"
+room:
+  translate: "Flytt"
+  save: "Lagre"
+  furnitures:
+    moon: "Måne"
+    bin: "Papirkurv"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@ -14,9 +14,6 @@ common:
    ui: "Interfejs"
    drive: "Dysk"
    drive-desc: "Chcesz opublikować zdjęcie, które już przesłałeś? Chcesz uporządkować, nazwać i utworzyć folder dla przesłanych plików? Dysk Misskey to najlepsze rozwiązanie dla Ciebie. Bardzo łatwo udostępniać swoje pliki online."
-  adblock:
-    detected: "Spróbuj wyłączyć blokadę reklam."
-    warning: "<strong>Misskey nie zawiera reklam</strong>, ale część funkcji może nie działać prawidłowo z włączonym blokowaniem reklam."
  application-authorization: "Współpraca aplikacji"
  close: "Zamknij"
  load-more: "Załaduj więcej"
@ -28,6 +25,18 @@ common:
  signin: "Zaloguj się"
  signup: "Rejestracja"
  signout: "Wyloguj się"
+  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
+  notification-type: "Typy powiadomień"
+  notification-types:
+    all: "Wszyscy"
+    pollVote: "Głosy"
+    follow: "Śledzeni"
+    receiveFollowRequest: "Prośby o śledzenie"
+    reply: "Odpowiedzi"
+    quote: "Cytat"
+    renote: "Udostępnij"
+    mention: "Wzmianki"
+    reaction: "Reakcje"
  got-it: "Rozumiem!"
  customization-tips:
    title: "Wskazówki o dostosowywaniu"
@ -86,8 +95,10 @@ common:
    visibility: "Widoczność"
    error: "Błąd"
    enter-username: "Wprowadź nazwę użytkownika"
+    specified-recipient: "Adresat"
    add-visible-user: "Dodaj użytkownika"
    username-prompt: "Wprowadź nazwę użytkownika"
+    enter-file-name: "Wprowadź nazwę pliku"
  weekday-short:
    sunday: "N"
    monday: "Pn"
@ -146,10 +157,12 @@ common:
    other: "Inne"
    appearance: "Wygląd"
    behavior: "Zachowanie"
+    reactions: "Reakcja"
    fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
    note-visibility: "Widoczność wpisów"
    remember-note-visibility: "Zapamiętaj widoczność wpisów"
    web-search-engine: "Wyszukiwarka internetowa"
+    paste: "Wklej"
    line-width: "Szerokości linii"
    line-width-thin: "Cienka"
    line-width-normal: "Normalna"
@ -1137,6 +1150,8 @@ mobile/views/pages/search.vue:
  search: "Szukaj"
 mobile/views/pages/selectdrive.vue:
  select-file: "Wybierz plik"
+mobile/views/pages/notifications.vue:
+  notifications: "Powiadomienia"
 mobile/views/pages/settings.vue:
  signed-in-as: "Zalogowany jako {}"
 mobile/views/pages/user.vue:
@ -1242,3 +1257,10 @@ pages:
        arg1: "Listy"
    types:
      array: "Listy"
+room:
+  translate: "Przenieś"
+  save: "Zapisz"
+  saved: "Zapisano"
+  furnitures:
+    moon: "Księżyc"
+    bin: "Kosz"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -12,12 +12,12 @@ common:
    rich-contents: "Post"
    rich-contents-desc: "Apenas poste suas ideias, temas do momento e qualquer coisa que você queira compartilhar. Você pode querer decorar suas palavras, anexar suas imagens favoritas, enviar arquivos, inclusive vídeos ou criar uma enquete. Essas são as coisas que você pode fazer em Misskey."
    reaction: "Reações"
-  adblock:
-    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
+    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません"
  application-authorization: "Aplicativos autorizados"
  close: "Fechar"
  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
+  notification-types:
+    follow: "Seguindo"
  got-it: "Entendi!"
  customization-tips:
    title: "Dicas de personalização"
@ -282,3 +282,7 @@ pages:
  blocks:
    image: "Imagens"
    post: "Formulário de publicação"
+room:
+  furnitures:
+    moon: "Lua"
+    bin: "Lixo"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@ -18,9 +18,6 @@ common:
    drive: "Хранилище файлов"
    drive-desc: "Хотите запостить картинку, которую уже отправляли ранее? Хочется сортировать, переименовать и создать папку для ваших выложенных файлов? Тогда Misskey Drive - это лучшее решение для вас. Очень лёгкий способ делиться своими файлами онлайн."
    outro: "Попробуйте будущие, уникальные для Misskey функции своими глазами! Если чувствуете, что это не в вашем вкусе, то попробуйте другие инстанции, ведь Misskey - это децентрализованная социальная сеть, так что ты можешь с лёгкостью найти себе товарищей. И наконец, GLHF!"
-  adblock:
-    detected: "Пожалуйста, отключите блокировщик рекламы."
-    warning: "Некоторые функции перестанут быть доступными или будут работать неправильно, если включена блокировка рекламы. <strong>В Misskey нет рекламы</strong>."
  application-authorization: "Авторизация приложений"
  close: "Закрыть"
  do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
@ -168,3 +165,7 @@ pages:
      random: "Случайно"
    blocks:
      random: "Случайно"
+room:
+  furnitures:
+    moon: "Луна"
+    bin: "Мусорное ведро"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -18,9 +18,6 @@ common:
    drive: "网盘"
    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的网盘是一个最好的解决方案。"
    outro: "Misskey还有其他更多功能，请亲身体验一下吧。因为 Misskey 是一个分布式的 SNS，如果您感觉某个功能不适合自己，试试其他的吧。祝您玩得开心！"
-  adblock:
-    detected: "请关闭广告拦截器"
-    warning: "<strong>Misskey不会发布广告</strong>如果您启用广告拦截器, 可能会导致某些功能无法正常使用。"
  application-authorization: "应用程序授权"
  close: "关闭"
  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
@ -36,6 +33,19 @@ common:
  reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
  fetching-as-ap-object: "联合查询"
  unfollow-confirm: "取消对{name}的关注？"
+  delete-confirm: "确定删除这个投稿吗?"
+  signin-required: "请先登录"
+  notification-type: "通知类型"
+  notification-types:
+    all: "所有"
+    pollVote: "投票"
+    follow: "关注中"
+    receiveFollowRequest: "关注请求"
+    reply: "回复"
+    quote: "引用"
+    renote: "转推"
+    mention: "提及"
+    reaction: "回应"
  got-it: "知道了"
  customization-tips:
    title: "自定义提示"
@ -93,6 +103,12 @@ common:
    "read:reactions": "查看回应"
    "write:reactions": "回应操作"
    "write:votes": "投票"
+    "read:pages": "查看页面"
+    "write:pages": "操作页面"
+    "read:page-likes": "查看喜欢的页面"
+    "write:page-likes": "操作喜欢的页面"
+    "read:user-groups": "查看用户组"
+    "write:user-groups": "操作用户组"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
    explore: "查找用户"
@ -120,6 +136,7 @@ common:
    geolocation-alert: "您的设备不支持定位服务"
    error: "错误"
    enter-username: "输入用户名"
+    specified-recipient: "收件人"
    add-visible-user: "添加用户"
    cw-placeholder: "评论帖子(可选)"
    username-prompt: "输入用户名"
@ -183,6 +200,7 @@ common:
    other: "其他"
    appearance: "设计"
    behavior: "行为"
+    reactions: "回应"
    fetch-on-scroll: "向下滚动时自动加载"
    fetch-on-scroll-desc: "向下滚动页面时，它会自动提取其他内容。"
    note-visibility: "帖子可见性"
@ -202,6 +220,7 @@ common:
    use-avatar-reversi-stones: "用头像作为黑白棋的棋子"
    disable-animated-mfm: "在帖子中禁用动画文本"
    disable-showing-animated-images: "不播放动画"
+    enable-quick-notification-view: "启用通知快速查看"
    suggest-recent-hashtags: "在帖子表单上显示最近流行的哈希标签"
    always-show-nsfw: "总是显示 NSFW 的内容"
    always-mark-nsfw: "总是用 NSFW 来标记附件"
@ -232,7 +251,7 @@ common:
    deck-column-width-wide: "宽"
    use-shadow: "在UI中使用阴影效果"
    rounded-corners: "UI界面圆角效果"
-    circle-icons: "使用圆形图标"
+    circle-icons: "使用圆形头像"
    contrasted-acct: "增加用户名的对比度"
    wallpaper: "壁纸"
    choose-wallpaper: "选择壁纸"
@ -282,6 +301,16 @@ common:
    saved: "已保存"
    home-profile: "定制首页数据"
    deck-profile: "定制Deck数据"
+    room: "房间"
+    _room:
+      graphicsQuality: "图形质量"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "使用正交相机"
  search: "搜索"
  delete: "删除"
  loading: "正在加载中"
@ -366,6 +395,9 @@ common/views/pages/explore.vue:
  federated: "联合"
  explore: "查找{host}"
  users-info: "当前有{users}个注册用户"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}作出了{reaction}的回应"
+  many-users: "{users}和其他{omitted}人做出了{reaction}的回应"
 common/views/components/url-preview.vue:
  enable-player: "打开播放器"
  disable-player: "关闭播放器"
@ -531,6 +563,8 @@ common/views/components/note-menu.vue:
  unpin: "取消置顶"
  delete: "删除"
  delete-confirm: "确定删除这个投稿吗?"
+  delete-and-edit: "删除和编辑"
+  delete-and-edit-confirm: "要删除此帖并再次编辑吗？对此帖的所有回应，转推和回复也将被删除。"
  remote: "显示原始投稿"
  pin-limit-exceeded: "无法置顶更多了。"
 common/views/components/user-menu.vue:
@ -726,6 +760,8 @@ common/views/components/profile-editor.vue:
  uploading: "正在上传"
  upload-failed: "上传失败"
  unable-to-process: "无法完成操作"
+  avatar-not-an-image: "选择的头像文件不是图片格式"
+  banner-not-an-image: "选择的横幅背景不是图片格式"
  email: "邮件设置"
  email-address: "电子邮件地址"
  email-verified: "电子邮件地址已验证"
@ -745,6 +781,8 @@ common/views/components/profile-editor.vue:
  danger-zone: "危险选项"
  delete-account: "删除帐户"
  account-deleted: "帐户已被删除。 数据会在一段时间之后清除。"
+  profile-metadata: "个人资料补充信息"
+  metadata-label: "标签"
  metadata-content: "内容"
 common/views/components/user-list-editor.vue:
  users: "用户"
@ -784,6 +822,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "没有公告"
  have-a-nice-day: "祝你有愉快的一天！"
  next: "下一个"
+  prev: "上一首"
 common/views/widgets/calendar.vue:
  year: "{}年"
  month: "{}月"
@ -897,7 +936,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "复制链接"
    download: "下载"
    else-files: "其他"
-    set-as-avatar: "设置为头像"
+    set-as-avatar: "设为头像"
    set-as-banner: "设置为背景"
    open-in-app: "在应用程序中打开"
    add-app: "添加应用"
@ -1115,6 +1154,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "群组"
  follow-requests: "关注申请"
  admin: "管理"
+  room: "房间"
 desktop/views/components/ui.header.nav.vue:
  game: "游戏"
 desktop/views/components/ui.header.notifications.vue:
@ -1381,6 +1421,7 @@ admin/views/users.vue:
    state:
      title: "状态"
      all: "全部"
+      available: "可用"
      admin: "管理员"
      moderator: "版主"
      adminOrModerator: "管理员+版主"
@ -1694,6 +1735,8 @@ mobile/views/pages/search.vue:
  not-found: "没有找到有关于“{q}”的帖子"
 mobile/views/pages/selectdrive.vue:
  select-file: "选择文件"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
 mobile/views/pages/settings.vue:
  signed-in-as: "以{}登录"
 mobile/views/pages/user.vue:
@ -1784,6 +1827,9 @@ pages:
  read-page: "查看源"
  page-created: "页面已创建"
  page-updated: "页面已更新"
+  name-already-exists: "该页面URL已存在"
+  title-invalid-name: "无效的页面URL"
+  text-invalid-name: "请确认该项不为空"
  are-you-sure-delete: "是否删除此页面？"
  page-deleted: "该页面已被删除。"
  edit-this-page: "编辑此页面"
@ -2052,3 +2098,64 @@ pages:
    enviromentVariables: "环境变量"
    pageVariables: "页面元素"
    argVariables: "输入槽函数"
+room:
+  add-furniture: "放置家具"
+  translate: "移动"
+  rotate: "旋转"
+  exit: "返回"
+  remove: "移除"
+  save: "保存"
+  saved: "已保存"
+  clear: "清理"
+  clear-confirm: "是否清除所有家具？"
+  leave-confirm: "有尚未保存的修改。是否离开？"
+  chooseImage: "选择图片"
+  room-type: "房间类型"
+  carpet-color: "地板颜色"
+  rooms:
+    default: "默认"
+    washitsu: "和式房间"
+  furnitures:
+    milk: "牛奶纸箱"
+    bed: "床"
+    low-table: "矮桌"
+    desk: "书桌"
+    chair: "椅子"
+    chair2: "椅子2"
+    fan: "换气扇"
+    pc: "电脑"
+    plant: "观叶植物"
+    plant2: "观叶植物2"
+    eraser: "橡皮擦"
+    pencil: "铅笔"
+    pudding: "布丁"
+    cardboard-box: "纸板箱"
+    cardboard-box2: "纸板箱2"
+    cardboard-box3: "纸板箱3"
+    book: "书"
+    book2: "书2"
+    piano: "钢琴"
+    facial-tissue: "纸巾盒"
+    server: "服务器"
+    moon: "月球"
+    corkboard: "软木板"
+    mousepad: "鼠标垫"
+    monitor: "显示器"
+    keyboard: "键盘"
+    carpet-stripe: "地毯(条纹)"
+    mat: "垫子"
+    color-box: "收纳柜"
+    wall-clock: "挂钟"
+    photoframe: "相框"
+    cube: "立方体"
+    tv: "电视"
+    pinguin: "企鹅君"
+    rubik-cube: "魔方"
+    poster-h: "海报(横向)"
+    poster-v: "海报(纵向)"
+    sofa: "沙发"
+    spiral: "螺旋楼梯"
+    bin: "垃圾箱"
+    cup-noodle: "杯面"
+    holo-display: "全息显示器"
+    energy-drink: "能量饮料"
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@ -7,8 +7,6 @@ common:
    rich-contents: "發佈"
    reaction: "回應"
    drive: "雲端硬碟"
-  adblock:
-    detected: "請禁用廣告封鎖器"
  close: "關閉"
  enter-password: "請輸入密碼"
  2fa: "雙重身份驗證"
@ -88,3 +86,6 @@ admin/views/charts.vue:
  drive: "雲端硬碟"
 pages:
  like: "贊"
+room:
+  furnitures:
+    moon: "月"
--- a/migration/1563757595828-UsedUsername.ts
+++ b/migration/1563757595828-UsedUsername.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class UsedUsername1563757595828 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP TABLE "used_username"`);
+    }
+
+}
--- a/migration/1565634203341-room.ts
+++ b/migration/1565634203341-room.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class room1565634203341 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@ -1,267 +1,272 @@
 {
-	"name": "misskey",
-	"author": "syuilo <i@syuilo.com>",
-	"version": "11.25.1",
-	"codename": "daybreak",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/syuilo/misskey.git"
-	},
-	"main": "./index.js",
-	"private": true,
-	"scripts": {
-		"start": "node ./index.js",
-		"init": "npm run migrate",
-		"ormconfig": "node ./built/ormconfig.js",
-		"migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
-		"migrateandstart": "npm run migrate && npm run start",
-		"build": "webpack && gulp build",
-		"webpack": "webpack",
-		"watch": "webpack --watch",
-		"gulp": "gulp build",
-		"clean": "gulp clean",
-		"cleanall": "gulp cleanall",
-		"lint": "gulp lint",
-		"test": "gulp test",
-		"format": "gulp format"
-	},
-	"resolutions": {
-		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
-		"video-thumbnail-generator/lodash": "^4.17.13"
-	},
-	"dependencies": {
-		"@elastic/elasticsearch": "7.1.0",
-		"@fortawesome/fontawesome-svg-core": "1.2.19",
-		"@fortawesome/free-brands-svg-icons": "5.9.0",
-		"@fortawesome/free-regular-svg-icons": "5.9.0",
-		"@fortawesome/free-solid-svg-icons": "5.9.0",
-		"@fortawesome/vue-fontawesome": "0.1.6",
-		"@koa/cors": "3.0.0",
-		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.15",
-		"@types/cbor": "2.0.0",
-		"@types/dateformat": "3.0.0",
-		"@types/deep-equal": "1.0.1",
-		"@types/double-ended-queue": "2.1.1",
-		"@types/gulp": "4.0.6",
-		"@types/gulp-mocha": "0.0.32",
-		"@types/gulp-rename": "0.0.33",
-		"@types/gulp-replace": "0.0.31",
-		"@types/gulp-uglify": "3.0.6",
-		"@types/gulp-util": "3.0.34",
-		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.12.1",
-		"@types/jsdom": "12.2.4",
-		"@types/katex": "0.10.1",
-		"@types/koa": "2.0.49",
-		"@types/koa-bodyparser": "5.0.2",
-		"@types/koa-compress": "2.0.9",
-		"@types/koa-cors": "0.0.0",
-		"@types/koa-favicon": "2.0.19",
-		"@types/koa-logger": "3.1.1",
-		"@types/koa-mount": "4.0.0",
-		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.42",
-		"@types/koa-send": "4.1.2",
-		"@types/koa-views": "2.0.3",
-		"@types/koa__cors": "2.2.3",
-		"@types/lolex": "3.1.1",
-		"@types/minio": "7.0.2",
-		"@types/mocha": "5.2.7",
-		"@types/node": "12.0.10",
-		"@types/nodemailer": "6.2.0",
-		"@types/nprogress": "0.2.0",
-		"@types/oauth": "0.9.1",
-		"@types/parse5": "5.0.0",
-		"@types/parsimmon": "1.10.0",
-		"@types/portscanner": "2.1.0",
-		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.3",
-		"@types/random-seed": "0.3.3",
-		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.13",
-		"@types/rename": "1.0.1",
-		"@types/request": "2.48.2",
-		"@types/request-promise-native": "1.0.16",
-		"@types/request-stats": "3.0.0",
-		"@types/rimraf": "2.0.2",
-		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.22.2",
-		"@types/showdown": "1.9.3",
-		"@types/speakeasy": "2.0.4",
-		"@types/systeminformation": "3.23.1",
-		"@types/tinycolor2": "1.4.2",
-		"@types/tmp": "0.1.0",
-		"@types/uuid": "3.4.5",
-		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.34",
-		"@types/webpack-stream": "3.2.10",
-		"@types/websocket": "0.0.40",
-		"@types/ws": "6.0.1",
-		"@typescript-eslint/parser": "1.11.0",
-		"animejs": "3.0.1",
-		"apexcharts": "3.8.2",
-		"autobind-decorator": "2.4.0",
-		"autosize": "4.0.2",
-		"autwh": "0.1.0",
-		"bcryptjs": "2.4.3",
-		"bootstrap": "4.3.1",
-		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.10.0",
-		"cafy": "15.1.1",
-		"cbor": "4.1.5",
-		"chai": "4.2.0",
-		"chalk": "2.4.2",
-		"cli-highlight": "2.1.1",
-		"commander": "2.20.0",
-		"content-disposition": "0.5.3",
-		"crc-32": "1.2.0",
-		"css-loader": "3.0.0",
-		"cssnano": "4.1.10",
-		"dateformat": "3.0.3",
-		"deep-equal": "1.0.1",
-		"diskusage": "1.1.3",
-		"double-ended-queue": "2.1.0-0",
-		"emojilib": "2.4.0",
-		"eslint": "6.0.1",
-		"eslint-plugin-vue": "5.2.3",
-		"eventemitter3": "4.0.0",
-		"feed": "3.0.0",
-		"file-type": "12.0.1",
-		"fuckadblock": "3.2.1",
-		"gulp": "4.0.2",
-		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "6.0.0",
-		"gulp-mocha": "6.0.0",
-		"gulp-rename": "1.4.0",
-		"gulp-replace": "1.0.0",
-		"gulp-sourcemaps": "2.6.5",
-		"gulp-stylus": "2.7.0",
-		"gulp-tslint": "8.1.4",
-		"gulp-typescript": "5.0.1",
-		"gulp-uglify": "3.0.2",
-		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.13.1",
-		"html-minifier": "4.0.0",
-		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.3.0",
-		"is-root": "2.1.0",
-		"is-svg": "4.2.0",
-		"js-yaml": "3.13.1",
-		"jsdom": "15.1.1",
-		"json5": "2.1.0",
-		"json5-loader": "3.0.0",
-		"jsrsasign": "8.0.12",
-		"katex": "0.10.2",
-		"koa": "2.7.0",
-		"koa-bodyparser": "4.2.1",
-		"koa-compress": "3.0.0",
-		"koa-favicon": "2.0.1",
-		"koa-json-body": "5.3.0",
-		"koa-logger": "3.2.0",
-		"koa-mount": "4.0.0",
-		"koa-multer": "1.0.2",
-		"koa-router": "7.4.0",
-		"koa-send": "5.0.0",
-		"koa-slow": "2.1.0",
-		"koa-views": "6.2.0",
-		"langmap": "0.0.16",
-		"loader-utils": "1.2.3",
-		"lolex": "4.1.0",
-		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.10",
-		"mocha": "6.1.4",
-		"moji": "0.5.1",
-		"moment": "2.24.0",
-		"ms": "2.1.2",
-		"nested-property": "1.0.1",
-		"node-fetch": "2.6.0",
-		"nodemailer": "6.2.1",
-		"nprogress": "0.2.0",
-		"object-assign-deep": "0.4.0",
-		"os-utils": "0.0.14",
-		"parse5": "5.1.0",
-		"parsimmon": "1.12.1",
-		"pg": "7.11.0",
-		"portscanner": "2.2.0",
-		"postcss-loader": "3.0.0",
-		"prismjs": "1.16.0",
-		"progress-bar-webpack-plugin": "1.12.1",
-		"promise-any": "0.2.0",
-		"promise-limit": "2.7.0",
-		"promise-sequential": "1.1.1",
-		"pug": "2.0.4",
-		"punycode": "2.1.1",
-		"pureimage": "0.1.6",
-		"qrcode": "1.4.0",
-		"random-seed": "0.3.0",
-		"randomcolor": "0.5.4",
-		"ratelimiter": "3.3.0",
-		"recaptcha-promise": "0.1.3",
-		"reconnecting-websocket": "4.1.10",
-		"redis": "2.8.0",
-		"reflect-metadata": "0.1.13",
-		"rename": "1.0.4",
-		"request": "2.88.0",
-		"request-promise-native": "1.0.7",
-		"request-stats": "3.0.0",
-		"require-all": "3.0.0",
-		"rimraf": "2.6.3",
-		"rndstr": "1.0.0",
-		"s-age": "1.1.2",
-		"seedrandom": "3.0.1",
-		"sharp": "0.22.1",
-		"showdown": "1.9.0",
-		"showdown-highlightjs-extension": "0.1.2",
-		"speakeasy": "2.0.0",
-		"stringz": "2.0.0",
-		"style-loader": "0.23.1",
-		"stylus": "0.54.5",
-		"stylus-loader": "3.0.2",
-		"summaly": "2.3.0",
-		"systeminformation": "4.14.3",
-		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.3.0",
-		"textarea-caret": "3.1.0",
-		"tinycolor2": "1.4.1",
-		"tmp": "0.1.0",
-		"ts-loader": "5.3.3",
-		"ts-node": "7.0.1",
-		"tslint": "5.18.0",
-		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.18",
-		"typescript": "3.5.2",
-		"uglify-es": "3.3.9",
-		"ulid": "2.3.0",
-		"url-loader": "2.0.1",
-		"uuid": "3.3.2",
-		"v-animate-css": "0.0.3",
-		"v-debounce": "0.1.2",
-		"video-thumbnail-generator": "1.1.3",
-		"vue": "2.6.10",
-		"vue-color": "2.7.0",
-		"vue-content-loading": "1.6.0",
-		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.12.0",
-		"vue-js-modal": "1.3.31",
-		"vue-json-pretty": "1.6.0",
-		"vue-loader": "15.7.0",
-		"vue-marquee-text-component": "1.1.1",
-		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.7",
-		"vue-sequential-entrance": "1.1.3",
-		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.16",
-		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.23.0",
-		"vuewordcloud": "18.7.11",
-		"vuex": "3.1.1",
-		"vuex-persistedstate": "2.5.4",
-		"web-push": "3.3.5",
-		"webpack": "4.35.3",
-		"webpack-cli": "3.3.5",
-		"websocket": "1.0.29",
-		"ws": "7.1.0",
-		"xev": "2.0.1"
-	}
+  "name": "misskey",
+  "author": "syuilo <i@syuilo.com>",
+  "version": "11.34.0",
+  "codename": "daybreak",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/syuilo/misskey.git"
+  },
+  "main": "./index.js",
+  "private": true,
+  "scripts": {
+    "start": "node ./index.js",
+    "init": "npm run migrate",
+    "ormconfig": "node ./built/ormconfig.js",
+    "migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
+    "migrateandstart": "npm run migrate && npm run start",
+    "build": "webpack && gulp build",
+    "webpack": "webpack",
+    "watch": "webpack --watch",
+    "gulp": "gulp build",
+    "clean": "gulp clean",
+    "cleanall": "gulp cleanall",
+    "lint": "gulp lint",
+    "test": "gulp test",
+    "format": "gulp format"
+  },
+  "resolutions": {
+    "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
+    "https-proxy-agent": "^3.0.0",
+    "lodash": "^4.17.13"
+  },
+  "dependencies": {
+    "@elastic/elasticsearch": "7.4.0",
+    "@fortawesome/free-regular-svg-icons": "5.11.2",
+    "@fortawesome/free-solid-svg-icons": "5.11.2",
+    "@koa/cors": "3.0.0",
+    "@koa/multer": "2.0.0",
+    "@koa/router": "8.0.2",
+    "agentkeepalive": "4.1.0",
+    "autobind-decorator": "2.4.0",
+    "autwh": "0.1.0",
+    "aws-sdk": "2.548.0",
+    "bcryptjs": "2.4.3",
+    "bull": "3.11.0",
+    "cafy": "15.1.1",
+    "cbor": "5.0.1",
+    "chalk": "2.4.2",
+    "cli-highlight": "2.1.1",
+    "commander": "3.0.2",
+    "content-disposition": "0.5.3",
+    "crc-32": "1.2.0",
+    "dateformat": "3.0.3",
+    "diskusage": "1.1.3",
+    "double-ended-queue": "2.1.0-0",
+    "feed": "4.0.0",
+    "file-type": "12.3.0",
+    "fluent-ffmpeg": "2.1.2",
+    "http-signature": "1.2.0",
+    "https-proxy-agent": "3.0.0",
+    "is-root": "2.1.0",
+    "is-svg": "4.2.0",
+    "js-yaml": "3.13.1",
+    "jsdom": "15.1.1",
+    "jsrsasign": "8.0.12",
+    "koa": "2.10.0",
+    "koa-bodyparser": "4.2.1",
+    "koa-compress": "3.0.0",
+    "koa-favicon": "2.0.1",
+    "koa-json-body": "5.3.0",
+    "koa-logger": "3.2.1",
+    "koa-mount": "4.0.0",
+    "koa-send": "5.0.0",
+    "koa-slow": "2.1.0",
+    "koa-views": "6.2.1",
+    "langmap": "0.0.16",
+    "lookup-dns-cache": "2.1.0",
+    "ms": "2.1.2",
+    "nested-property": "1.0.1",
+    "nodemailer": "6.3.1",
+    "os-utils": "0.0.14",
+    "parse5": "5.1.0",
+    "parsimmon": "1.13.0",
+    "pg": "7.12.1",
+    "portscanner": "2.2.0",
+    "promise-limit": "2.7.0",
+    "pug": "2.0.4",
+    "punycode": "2.1.1",
+    "pureimage": "0.1.6",
+    "qrcode": "1.4.2",
+    "random-seed": "0.3.0",
+    "ratelimiter": "3.3.1",
+    "recaptcha-promise": "0.1.3",
+    "redis": "2.8.0",
+    "redis-lock": "0.1.4",
+    "reflect-metadata": "0.1.13",
+    "rename": "1.0.4",
+    "request": "2.88.0",
+    "request-promise-native": "1.0.7",
+    "request-stats": "3.0.0",
+    "require-all": "3.0.0",
+    "rndstr": "1.0.0",
+    "seedrandom": "3.0.5",
+    "sharp": "0.23.1",
+    "showdown": "1.9.0",
+    "showdown-highlightjs-extension": "0.1.2",
+    "speakeasy": "2.0.0",
+    "stringz": "2.0.0",
+    "summaly": "2.3.1",
+    "syslog-pro": "1.0.0",
+    "systeminformation": "4.14.11",
+    "tmp": "0.1.0",
+    "typeorm": "0.2.19",
+    "ulid": "2.3.0",
+    "uuid": "3.3.3",
+    "web-push": "3.4.0",
+    "websocket": "1.0.29",
+    "xev": "2.0.1"
+  },
+  "devDependencies": {
+    "@fortawesome/fontawesome-svg-core": "1.2.25",
+    "@fortawesome/free-brands-svg-icons": "5.11.2",
+    "@fortawesome/vue-fontawesome": "0.1.7",
+    "@types/bcryptjs": "2.4.2",
+    "@types/bull": "3.10.3",
+    "@types/cbor": "2.0.0",
+    "@types/dateformat": "3.0.1",
+    "@types/deep-equal": "1.0.1",
+    "@types/double-ended-queue": "2.1.1",
+    "@types/fluent-ffmpeg": "2.1.10",
+    "@types/gulp": "4.0.6",
+    "@types/gulp-mocha": "0.0.32",
+    "@types/gulp-rename": "0.0.33",
+    "@types/gulp-replace": "0.0.31",
+    "@types/gulp-uglify": "3.0.6",
+    "@types/gulp-util": "3.0.34",
+    "@types/is-url": "1.2.28",
+    "@types/js-yaml": "3.12.1",
+    "@types/jsdom": "12.2.4",
+    "@types/katex": "0.10.2",
+    "@types/koa": "2.0.50",
+    "@types/koa-bodyparser": "5.0.2",
+    "@types/koa-compress": "2.0.9",
+    "@types/koa-cors": "0.0.0",
+    "@types/koa-favicon": "2.0.19",
+    "@types/koa-logger": "3.1.1",
+    "@types/koa-mount": "4.0.0",
+    "@types/koa-send": "4.1.2",
+    "@types/koa-views": "2.0.3",
+    "@types/koa__cors": "2.2.3",
+    "@types/koa__multer": "2.0.0",
+    "@types/koa__router": "8.0.0",
+    "@types/lolex": "3.1.1",
+    "@types/mocha": "5.2.7",
+    "@types/node": "12.7.12",
+    "@types/nodemailer": "6.2.1",
+    "@types/nprogress": "0.2.0",
+    "@types/oauth": "0.9.1",
+    "@types/parse5": "5.0.2",
+    "@types/parsimmon": "1.10.0",
+    "@types/portscanner": "2.1.0",
+    "@types/pug": "2.0.4",
+    "@types/qrcode": "1.3.4",
+    "@types/random-seed": "0.3.3",
+    "@types/ratelimiter": "2.1.28",
+    "@types/redis": "2.8.14",
+    "@types/rename": "1.0.1",
+    "@types/request": "2.48.3",
+    "@types/request-promise-native": "1.0.17",
+    "@types/request-stats": "3.0.0",
+    "@types/rimraf": "2.0.2",
+    "@types/seedrandom": "2.4.28",
+    "@types/sharp": "0.22.3",
+    "@types/showdown": "1.9.3",
+    "@types/speakeasy": "2.0.5",
+    "@types/systeminformation": "3.23.1",
+    "@types/tinycolor2": "1.4.2",
+    "@types/tmp": "0.1.0",
+    "@types/uuid": "3.4.5",
+    "@types/web-push": "3.3.0",
+    "@types/webpack": "4.39.3",
+    "@types/webpack-stream": "3.2.10",
+    "@types/websocket": "0.0.40",
+    "@types/ws": "6.0.3",
+    "@typescript-eslint/parser": "2.3.3",
+    "animejs": "3.1.0",
+    "apexcharts": "3.10.0",
+    "autosize": "4.0.2",
+    "bootstrap": "4.3.1",
+    "bootstrap-vue": "2.0.4",
+    "chai": "4.2.0",
+    "css-loader": "3.2.0",
+    "cssnano": "4.1.10",
+    "deep-equal": "1.1.0",
+    "eslint": "6.5.1",
+    "eslint-plugin-vue": "5.2.3",
+    "eventemitter3": "4.0.0",
+    "gulp": "4.0.2",
+    "gulp-cssnano": "2.1.3",
+    "gulp-imagemin": "6.1.1",
+    "gulp-mocha": "7.0.2",
+    "gulp-rename": "1.4.0",
+    "gulp-replace": "1.0.0",
+    "gulp-sourcemaps": "2.6.5",
+    "gulp-stylus": "2.7.0",
+    "gulp-tslint": "8.1.4",
+    "gulp-typescript": "5.0.1",
+    "gulp-uglify": "3.0.2",
+    "gulp-util": "3.0.8",
+    "hard-source-webpack-plugin": "0.13.1",
+    "html-minifier": "4.0.0",
+    "insert-text-at-cursor": "0.3.0",
+    "json5": "2.1.1",
+    "json5-loader": "3.0.0",
+    "katex": "0.11.1",
+    "loader-utils": "1.2.3",
+    "lolex": "4.2.0",
+    "mocha": "6.2.1",
+    "moji": "0.5.1",
+    "multer": "1.4.2",
+    "node-fetch": "2.6.0",
+    "nprogress": "0.2.0",
+    "object-assign-deep": "0.4.0",
+    "postcss-loader": "3.0.0",
+    "prismjs": "1.17.1",
+    "progress-bar-webpack-plugin": "1.12.1",
+    "promise-sequential": "1.1.1",
+    "randomcolor": "0.5.4",
+    "reconnecting-websocket": "4.2.0",
+    "rimraf": "3.0.0",
+    "s-age": "1.1.2",
+    "style-loader": "1.0.0",
+    "stylus": "0.54.7",
+    "stylus-loader": "3.0.2",
+    "syuilo-password-strength": "0.0.1",
+    "terser-webpack-plugin": "2.1.3",
+    "textarea-caret": "3.1.0",
+    "three": "0.109.0",
+    "tinycolor2": "1.4.1",
+    "ts-loader": "6.2.0",
+    "ts-node": "8.4.1",
+    "tslint": "5.20.0",
+    "tslint-sonarts": "1.9.0",
+    "typescript": "3.6.4",
+    "uglify-es": "3.3.9",
+    "url-loader": "2.2.0",
+    "v-animate-css": "0.0.3",
+    "v-debounce": "0.1.2",
+    "vue": "2.6.10",
+    "vue-color": "2.7.0",
+    "vue-content-loading": "1.6.0",
+    "vue-cropperjs": "4.0.0",
+    "vue-i18n": "8.14.1",
+    "vue-js-modal": "1.3.31",
+    "vue-json-pretty": "1.6.2",
+    "vue-loader": "15.7.1",
+    "vue-marquee-text-component": "1.1.1",
+    "vue-prism-component": "1.1.1",
+    "vue-router": "3.1.3",
+    "vue-sequential-entrance": "1.1.3",
+    "vue-style-loader": "4.1.2",
+    "vue-svg-inline-loader": "1.3.3",
+    "vue-template-compiler": "2.6.10",
+    "vuedraggable": "2.23.2",
+    "vuewordcloud": "18.7.11",
+    "vuex": "3.1.1",
+    "vuex-persistedstate": "2.5.4",
+    "webpack": "4.41.1",
+    "webpack-cli": "3.3.9",
+    "ws": "7.1.2"
+  }
 }
--- a/src/@types/lookup-dns-cache.d.ts
+++ b/src/@types/lookup-dns-cache.d.ts
@ -1,17 +1,9 @@
 declare module 'lookup-dns-cache' {
-	type IPv4 = 4;
+	import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns';

-	type IPv6 = 6;
-
-	type Family = IPv4 | IPv6 | undefined;
-
-	interface IRunOptions {
-		family?: Family;
-		all?: boolean;
-	}
-
-	type RunCallback = (error: Error | null, address?: string | string[], family?: Family) => void;
-
-	export function lookup(hostname: string, options: IRunOptions | Family, callback: RunCallback): {} | undefined;
-	export function lookup(hostname: string, callback: RunCallback): {} | undefined;
+	function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+	function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+	function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void): void;
+	function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void): void;
+	function lookup(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
 }
--- a/src/@types/promise-any.d.ts
+++ b/src/@types/promise-any.d.ts
@ -1,7 +0,0 @@
-declare module 'promise-any' {
-	function promiseAny<T>(iterable: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-	namespace promiseAny {} // Hack
-
-	export = promiseAny;
-}
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@ -159,7 +159,7 @@ async function init(): Promise<Config> {
 	return config;
 }

-async function spawnWorkers(limit: number = Infinity) {
+async function spawnWorkers(limit: number = 1) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));
--- a/src/client/app/admin/script.ts
+++ b/src/client/app/admin/script.ts
@ -19,7 +19,8 @@ init(launch => {
 		mode: 'history',
 		base: '/admin/',
 		routes: [
-			{ path: '/', component: Index },
+			{ path: '/:page', component: Index },
+			{ path: '/', redirect: '/dashboard' },
 			{ path: '*', component: NotFound }
 		]
 	});
--- a/src/client/app/admin/views/federation.vue
+++ b/src/client/app/admin/views/federation.vue
@ -509,7 +509,7 @@ export default Vue.extend({

 		saveBlockedHosts() {
 			this.$root.api('admin/update-meta', {
-				blockedHosts: this.blockedHosts.split('\n')
+				blockedHosts: this.blockedHosts ? this.blockedHosts.split('\n') : []
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@ -18,18 +18,18 @@
 			<p class="name"><mk-user-name :user="$store.state.i"/></p>
 		</div>
 		<ul>
-			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
-			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
-			<li @click="nav('queue')" :class="{ active: page == 'queue' }"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</li>
-			<li @click="nav('logs')" :class="{ active: page == 'logs' }"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</li>
-			<li @click="nav('db')" :class="{ active: page == 'db' }"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</li>
-			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
-			<li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li>
-			<li @click="nav('federation')" :class="{ active: page == 'federation' }"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</li>
-			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
-			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
-			<li @click="nav('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
+			<li><router-link to="/dashboard" active-class="active"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</router-link></li>
+			<li><router-link to="/instance" active-class="active"><fa icon="cog" fixed-width/>{{ $t('instance') }}</router-link></li>
+			<li><router-link to="/queue" active-class="active"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</router-link></li>
+			<li><router-link to="/logs" active-class="active"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</router-link></li>
+			<li><router-link to="/db" active-class="active"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</router-link></li>
+			<li><router-link to="/moderators" active-class="active"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</router-link></li>
+			<li><router-link to="/users" active-class="active"><fa icon="users" fixed-width/>{{ $t('users') }}</router-link></li>
+			<li><router-link to="/drive" active-class="active"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</router-link></li>
+			<li><router-link to="/federation" active-class="active"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</router-link></li>
+			<li><router-link to="/emoji" active-class="active"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</router-link></li>
+			<li><router-link to="/announcements" active-class="active"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</router-link></li>
+			<li><router-link to="/abuse" active-class="active"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</router-link></li>
 		</ul>
 		<div class="back-to-misskey">
 			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
@ -102,7 +102,6 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			page: 'dashboard',
 			version,
 			isMobile,
 			navOpend: !isMobile,
@ -116,9 +115,9 @@ export default Vue.extend({
 			faDatabase,
 		};
 	},
-	methods: {
-		nav(page: string) {
-			this.page = page;
+	computed: {
+		page() {
+			return this.$route.params.page;
 		}
 	}
 });
@ -240,11 +239,10 @@ export default Vue.extend({
 			list-style none
 			font-size 15px

-			> li
+			> li > a
 				display block
 				padding 10px 16px
 				margin 0
-				cursor pointer
 				user-select none
 				color #eee
 				transition margin-left 0.2s ease
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@ -461,7 +461,7 @@ export default Vue.extend({
 				iconUrl: this.iconUrl,
 				name: this.name,
 				description: this.description,
-				langs: this.languages.split(' '),
+				langs: this.languages ? this.languages.split(' ') : [],
 				cacheRemoteFiles: this.cacheRemoteFiles,
 				localDriveCapacityMb: parseInt(this.localDriveCapacityMb, 10),
 				remoteDriveCapacityMb: parseInt(this.remoteDriveCapacityMb, 10),
@ -490,8 +490,8 @@ export default Vue.extend({
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
 				swPrivateKey: this.swPrivateKey,
-				pinnedUsers: this.pinnedUsers.split('\n'),
-				hiddenTags: this.hiddenTags.split('\n'),
+				pinnedUsers: this.pinnedUsers ? this.pinnedUsers.split('\n') : [],
+				hiddenTags: this.hiddenTags ? this.hiddenTags.split('\n') : [],
 				useObjectStorage: this.useObjectStorage,
 				objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null,
 				objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null,
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@ -42,6 +42,7 @@
 				<ui-select v-model="state">
 					<template #label>{{ $t('users.state.title') }}</template>
 					<option value="all">{{ $t('users.state.all') }}</option>
+					<option value="available">{{ $t('users.state.available') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@ -98,15 +98,10 @@

 	// If mobile, insert the viewport meta tag
 	if (isMobile) {
-		const meta = document.createElement('meta');
-		meta.setAttribute('name', 'viewport');
-		meta.setAttribute('content',
-			'width=device-width,' +
-			'initial-scale=1,' +
-			'minimum-scale=1,' +
-			'maximum-scale=1,' +
-			'user-scalable=no');
-		head.appendChild(meta);
+		const viewport = document.getElementsByName("viewport").item(0);
+		viewport.setAttribute('content',
+			`${viewport.getAttribute('content')},minimum-scale=1,maximum-scale=1,user-scalable=no`);
+		head.appendChild(viewport);
 	}

 	// Switch desktop or mobile version
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@ -1,18 +0,0 @@
-declare const fuckAdBlock: any;
-
-export default ($root: any) => {
-	require('fuckadblock');
-
-	function adBlockDetected() {
-		$root.dialog({
-			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning')
-		});
-	}
-
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@ -3,6 +3,8 @@ import { sum, unique } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
 import MkReactionPicker from '../views/components/reaction-picker.vue';
+import pleaseLogin from './please-login';
+import i18n from '../../i18n';

 function focus(el, fn) {
 	const target = fn(el);
@ -20,10 +22,13 @@ type Opts = {
 };

 export default (opts: Opts = {}) => ({
+	i18n: i18n(),
+
 	data() {
 		return {
 			showContent: false,
-			hideThisNote: false
+			hideThisNote: false,
+			openingMenu: false
 		};
 	},

@ -108,6 +113,7 @@ export default (opts: Opts = {}) => ({

 	methods: {
 		reply(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				reply: this.appearNote,
 				animation: !viaKeyboard,
@ -118,6 +124,7 @@ export default (opts: Opts = {}) => ({
 		},

 		renote(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				renote: this.appearNote,
 				animation: !viaKeyboard,
@ -134,13 +141,17 @@ export default (opts: Opts = {}) => ({
 		},

 		react(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.blur();
-			this.$root.new(MkReactionPicker, {
+			const w = this.$root.new(MkReactionPicker, {
 				source: this.$refs.reactButton,
 				note: this.appearNote,
 				showFocus: viaKeyboard,
 				animation: !viaKeyboard
 			}).$once('closed', this.focus);
+			this.$once('hook:beforeDestroy', () => {
+				w.close();
+			});
 		},

 		reactDirectly(reaction) {
@ -159,6 +170,7 @@ export default (opts: Opts = {}) => ({
 		},

 		favorite() {
+			pleaseLogin(this.$root);
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
@ -170,17 +182,33 @@ export default (opts: Opts = {}) => ({
 		},

 		del() {
-			this.$root.api('notes/delete', {
-				noteId: this.appearNote.id
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('@.delete-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+
+				this.$root.api('notes/delete', {
+					noteId: this.appearNote.id
+				});
 			});
 		},

 		menu(viaKeyboard = false) {
-			this.$root.new(MkNoteMenu, {
+			if (this.openingMenu) return;
+			this.openingMenu = true;
+			const w = this.$root.new(MkNoteMenu, {
 				source: this.$refs.menuButton,
 				note: this.appearNote,
 				animation: !viaKeyboard
-			}).$once('closed', this.focus);
+			}).$once('closed', () => {
+				this.openingMenu = false;
+				this.focus();
+			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		},

 		toggleShowContent() {
--- a/src/client/app/common/scripts/paging.ts
+++ b/src/client/app/common/scripts/paging.ts
@ -44,13 +44,21 @@ export default (opts) => ({
 				return window.scrollY <= 8;
 			};

-			window.addEventListener('scroll', this.onWindowScroll, { passive: true });
+			window.addEventListener('scroll', this.onScroll, { passive: true });
+		} else if (opts.isContainer) {
+			this.isScrollTop = () => {
+				return this.$el.scrollTop <= 8;
+			};
+
+			this.$el.addEventListener('scroll', this.onScroll, { passive: true });
 		}
 	},

 	beforeDestroy() {
 		if (opts.captureWindowScroll) {
-			window.removeEventListener('scroll', this.onWindowScroll);
+			window.removeEventListener('scroll', this.onScroll);
+		} else if (opts.isContainer) {
+			this.$el.removeEventListener('scroll', this.onScroll);
 		}
 	},

@ -67,6 +75,7 @@ export default (opts) => ({

 		async init() {
 			this.fetching = true;
+			if (opts.beforeInit) opts.beforeInit(this);
 			let params = typeof this.pagination.params === 'function' ? this.pagination.params(true) : this.pagination.params;
 			if (params && params.then) params = await params;
 			await this.$root.api(this.pagination.endpoint, {
@ -151,7 +160,7 @@ export default (opts) => ({
 			this.queue = [];
 		},

-		onWindowScroll() {
+		onScroll() {
 			if (this.isScrollTop()) {
 				this.onTop();
 			}
@ -162,8 +171,10 @@ export default (opts) => ({
 				// http://d.hatena.ne.jp/favril/20091105/1257403319
 				if (this.$el.offsetHeight == 0) return;

-				const current = window.scrollY + window.innerHeight;
-				if (current > document.body.offsetHeight - 8) this.onBottom();
+				const bottomPosition = opts.isContainer ? this.$el.scrollHeight : document.body.offsetHeight;
+
+				const currentBottomPosition = opts.isContainer ? this.$el.scrollTop + this.$el.clientHeight : window.scrollY + window.innerHeight;
+				if (currentBottomPosition > (bottomPosition - 8)) this.onBottom();
 			}
 		},

--- a/src/client/app/common/scripts/please-login.ts
+++ b/src/client/app/common/scripts/please-login.ts
@ -0,0 +1,10 @@
+export default ($root: any) => {
+	if ($root.$store.getters.isSignedIn) return;
+
+	$root.dialog({
+		title: $root.$t('@.signin-required'),
+		text: null
+	});
+
+	throw new Error('signin required');
+};
--- a/src/client/app/common/scripts/post-form.ts
+++ b/src/client/app/common/scripts/post-form.ts
@ -35,6 +35,10 @@ export default (opts) => ({
 			type: String,
 			required: false
 		},
+		initialNote: {
+			type: Object,
+			required: false
+		},
 		instant: {
 			type: Boolean,
 			required: false,
@ -149,6 +153,10 @@ export default (opts) => ({
 		// デフォルト公開範囲
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);

+		if (this.reply && this.reply.localOnly) {
+			this.localOnly = true;
+		}
+
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
 		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
@ -158,13 +166,13 @@ export default (opts) => ({
 				}).then(users => {
 					this.visibleUsers.push(...users);
 				});
-			}
-		}

-		if (this.reply && this.reply.userId !== this.$store.state.i.id) {
-			this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
-				this.visibleUsers.push(user);
-			});
+				if (this.reply.userId !== this.$store.state.i.id) {
+					this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
+						this.visibleUsers.push(user);
+					});
+				}
+			}
 		}

 		// keep cw when reply
@ -196,6 +204,29 @@ export default (opts) => ({
 				}
 			}

+			// 削除して編集
+			if (this.initialNote) {
+				const init = this.initialNote;
+				this.text = init.text ? init.text : '';
+				this.files = init.files;
+				this.cw = init.cw;
+				this.useCw = init.cw != null;
+				if (init.poll) {
+					this.poll = true;
+					this.$nextTick(() => {
+						(this.$refs.poll as any).set({
+							choices: init.poll.choices.map(c => c.text),
+							multiple: init.poll.multiple
+						});
+					});
+				}
+				// hack 位置情報投稿が動くようになったら適用する
+				this.geo = null;
+				this.visibility = init.visibility;
+				this.localOnly = init.localOnly;
+				this.quoteId = init.renote ? init.renote.id : null;
+			}
+
 			this.$nextTick(() => this.watch());
 		});
 	},
@ -292,11 +323,14 @@ export default (opts) => ({
 		setVisibility() {
 			const w = this.$root.new(MkVisibilityChooser, {
 				source: this.$refs.visibilityButton,
-				currentVisibility: this.visibility
+				currentVisibility: this.localOnly ? `local-${this.visibility}` : this.visibility
 			});
 			w.$once('chosen', v => {
 				this.applyVisibility(v);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.close();
+			});
 		},

 		applyVisibility(v: string) {
@ -328,6 +362,7 @@ export default (opts) => ({
 			this.text = '';
 			this.files = [];
 			this.poll = false;
+			this.quoteId = null;
 			this.$emit('change-attached-files', this.files);
 		},

@ -357,7 +392,7 @@ export default (opts) => ({

 			const paste = e.clipboardData.getData('text');

-			if (paste.startsWith(url + '/notes/')) {
+			if (!this.renote && !this.quoteId && paste.startsWith(url + '/notes/')) {
 				e.preventDefault();

 				this.$root.dialog({
@ -425,6 +460,9 @@ export default (opts) => ({
 			vm.$once('chosen', emoji => {
 				insertTextAtCursor(this.$refs.text, emoji);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				vm.close();
+			});
 		},

 		saveDraft() {
--- a/src/client/app/common/scripts/room/furniture.ts
+++ b/src/client/app/common/scripts/room/furniture.ts
@ -0,0 +1,21 @@
+export type RoomInfo = {
+	roomType: string;
+	carpetColor: string;
+	furnitures: Furniture[];
+};
+
+export type Furniture = {
+	id: string; // 同じ家具が複数ある場合にそれぞれを識別するためのIDであり、家具IDではない
+	type: string; // こっちが家具ID(chairとか)
+	position: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	rotation: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	props?: Record<string, any>;
+};
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@ -0,0 +1,397 @@
+// 家具メタデータ
+
+// 家具にはユーザーが設定できるプロパティを設定可能です:
+//
+// props: {
+//   <propname>: <proptype>
+// }
+//
+// proptype一覧:
+// * image ... 画像選択ダイアログを出し、その画像のURLが格納されます
+// * color ... 色選択コントロールを出し、選択された色が格納されます
+
+// 家具にカスタムテクスチャを適用できるようにするには、textureプロパティに以下の追加の情報を含めます:
+// 便宜上そのUVのどの部分にカスタムテクスチャを貼り合わせるかのエリアをテクスチャエリアと呼びます。
+// UVは1024*1024だと仮定します。
+//
+// <key>: {
+//   prop: <プロパティ名>,
+//   uv: {
+//     x: <テクスチャエリアX座標>,
+//     y: <テクスチャエリアY座標>,
+//     width: <テクスチャエリアの幅>,
+//     height: <テクスチャエリアの高さ>,
+//   },
+// }
+//
+// <key>には、カスタムテクスチャを適用したいメッシュ名を指定します
+// <プロパティ名>には、カスタムテクスチャとして使用する画像を格納するプロパティ(前述)名を指定します
+
+// 家具にカスタムカラーを適用できるようにするには、colorプロパティに以下の追加の情報を含めます:
+//
+// <key>: <プロパティ名>
+//
+// <key>には、カスタムカラーを適用したいマテリアル名を指定します
+// <プロパティ名>には、カスタムカラーとして使用する色を格納するプロパティ(前述)名を指定します
+
+[
+	{
+		id: "milk",
+		place: "floor"
+	},
+	{
+		id: "bed",
+		place: "floor"
+	},
+	{
+		id: "low-table",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Table: 'color'
+		}
+	},
+	{
+		id: "desk",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Board: 'color'
+		}
+	},
+	{
+		id: "chair",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Chair: 'color'
+		}
+	},
+	{
+		id: "chair2",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			Cushion: 'color1',
+			Leg: 'color2'
+		}
+	},
+	{
+		id: "fan",
+		place: "wall"
+	},
+	{
+		id: "pc",
+		place: "floor"
+	},
+	{
+		id: "plant",
+		place: "floor"
+	},
+	{
+		id: "plant2",
+		place: "floor"
+	},
+	{
+		id: "eraser",
+		place: "floor"
+	},
+	{
+		id: "pencil",
+		place: "floor"
+	},
+	{
+		id: "pudding",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box2",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box3",
+		place: "floor"
+	},
+	{
+		id: "book",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cover: 'color'
+		}
+	},
+	{
+		id: "book2",
+		place: "floor"
+	},
+	{
+		id: "piano",
+		place: "floor"
+	},
+	{
+		id: "facial-tissue",
+		place: "floor"
+	},
+	{
+		id: "server",
+		place: "floor"
+	},
+	{
+		id: "moon",
+		place: "floor"
+	},
+	{
+		id: "corkboard",
+		place: "wall"
+	},
+	{
+		id: "mousepad",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Pad: 'color'
+		}
+	},
+	{
+		id: "monitor",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "tv",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "keyboard",
+		place: "floor"
+	},
+	{
+		id: "carpet-stripe",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			CarpetAreaA: 'color1',
+			CarpetAreaB: 'color2'
+		},
+	},
+	{
+		id: "mat",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Mat: 'color'
+		}
+	},
+	{
+		id: "color-box",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			main: 'color'
+		}
+	},
+	{
+		id: "wall-clock",
+		place: "wall"
+	},
+	{
+		id: "cube",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cube: 'color'
+		}
+	},
+	{
+		id: "photoframe",
+		place: "wall",
+		props: {
+			photo: 'image',
+			color: 'color'
+		},
+		texture: {
+			Photo: {
+				prop: 'photo',
+				uv: {
+					x: 0,
+					y: 342,
+					width: 1024,
+					height: 683,
+				},
+			},
+		},
+		color: {
+			Frame: 'color'
+		}
+	},
+	{
+		id: "pinguin",
+		place: "floor",
+		props: {
+			body: 'color',
+			belly: 'color'
+		},
+		color: {
+			Body: 'body',
+			Belly: 'belly',
+		}
+	},
+	{
+		id: "rubik-cube",
+		place: "floor",
+	},
+	{
+		id: "poster-h",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 277,
+					width: 1024,
+					height: 745,
+				},
+			},
+		},
+	},
+	{
+		id: "poster-v",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 745,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: "sofa",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Sofa: 'color'
+		}
+	},
+	{
+		id: "spiral",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Step: 'color'
+		}
+	},
+	{
+		id: "bin",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Bin: 'color'
+		}
+	},
+	{
+		id: "cup-noodle",
+		place: "floor"
+	},
+	{
+		id: "holo-display",
+		place: "floor",
+		props: {
+			image: 'image'
+		},
+		texture: {
+			Image_Front: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+			Image_Back: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: 'energy-drink',
+		place: "floor",
+	}
+]
--- a/src/client/app/common/scripts/room/room.ts
+++ b/src/client/app/common/scripts/room/room.ts
@ -0,0 +1,776 @@
+import autobind from 'autobind-decorator';
+import { v4 as uuid } from 'uuid';
+import * as THREE from 'three';
+import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
+import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js';
+import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js';
+import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
+import { Furniture, RoomInfo } from './furniture';
+import { query as urlQuery } from '../../../../../prelude/url';
+const furnitureDefs = require('./furnitures.json5');
+
+THREE.ImageUtils.crossOrigin = '';
+
+type Options = {
+	graphicsQuality: Room['graphicsQuality'];
+	onChangeSelect: Room['onChangeSelect'];
+	useOrthographicCamera: boolean;
+};
+
+/**
+ * MisskeyRoom Core Engine
+ */
+export class Room {
+	private clock: THREE.Clock;
+	private scene: THREE.Scene;
+	private renderer: THREE.WebGLRenderer;
+	private camera: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+	private controls: OrbitControls;
+	private composer: EffectComposer;
+	private mixers: THREE.AnimationMixer[] = [];
+	private furnitureControl: TransformControls;
+	private roomInfo: RoomInfo;
+	private graphicsQuality: 'cheep' | 'low' | 'medium' | 'high' | 'ultra';
+	private roomObj: THREE.Object3D;
+	private objects: THREE.Object3D[] = [];
+	private selectedObject: THREE.Object3D = null;
+	private onChangeSelect: Function;
+	private isTransformMode = false;
+	private renderFrameRequestId: number;
+
+	private get canvas(): HTMLCanvasElement {
+		return this.renderer.domElement;
+	}
+
+	private get furnitures(): Furniture[] {
+		return this.roomInfo.furnitures;
+	}
+
+	private set furnitures(furnitures: Furniture[]) {
+		this.roomInfo.furnitures = furnitures;
+	}
+
+	private get enableShadow() {
+		return this.graphicsQuality != 'cheep';
+	}
+
+	private get usePostFXs() {
+		return this.graphicsQuality !== 'cheep' && this.graphicsQuality !== 'low';
+	}
+
+	private get shadowQuality() {
+		return (
+			this.graphicsQuality === 'ultra' ? 16384 :
+			this.graphicsQuality === 'high' ? 8192 :
+			this.graphicsQuality === 'medium' ? 4096 :
+			this.graphicsQuality === 'low' ? 1024 :
+			0); // cheep
+	}
+
+	constructor(user, isMyRoom, roomInfo: RoomInfo, container, options: Options) {
+		this.roomInfo = roomInfo;
+		this.graphicsQuality = options.graphicsQuality;
+		this.onChangeSelect = options.onChangeSelect;
+
+		this.clock = new THREE.Clock(true);
+
+		//#region Init a scene
+		this.scene = new THREE.Scene();
+
+		const width = window.innerWidth;
+		const height = window.innerHeight;
+
+		//#region Init a renderer
+		this.renderer = new THREE.WebGLRenderer({
+			antialias: false,
+			stencil: false,
+			alpha: false,
+			powerPreference:
+				this.graphicsQuality === 'ultra' ? 'high-performance' :
+				this.graphicsQuality === 'high' ? 'high-performance' :
+				this.graphicsQuality === 'medium' ? 'default' :
+				this.graphicsQuality === 'low' ? 'low-power' :
+				'low-power' // cheep
+		});
+
+		this.renderer.setPixelRatio(window.devicePixelRatio);
+		this.renderer.setSize(width, height);
+		this.renderer.autoClear = false;
+		this.renderer.setClearColor(new THREE.Color(0x051f2d));
+		this.renderer.shadowMap.enabled = this.enableShadow;
+		this.renderer.shadowMap.type =
+			this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'medium' ? THREE.PCFShadowMap :
+			this.graphicsQuality === 'low' ? THREE.BasicShadowMap :
+			THREE.BasicShadowMap; // cheep
+
+		container.appendChild(this.canvas);
+		//#endregion
+
+		//#region Init a camera
+		this.camera = options.useOrthographicCamera
+			? new THREE.OrthographicCamera(
+				width / - 2, width / 2, height / 2, height / - 2, -10, 10)
+			: new THREE.PerspectiveCamera(45, width / height);
+
+		if (options.useOrthographicCamera) {
+			this.camera.position.x = 2;
+			this.camera.position.y = 2;
+			this.camera.position.z = 2;
+			this.camera.zoom = 100;
+			this.camera.updateProjectionMatrix();
+		} else {
+			this.camera.position.x = 5;
+			this.camera.position.y = 2;
+			this.camera.position.z = 5;
+		}
+
+		this.scene.add(this.camera);
+		//#endregion
+
+		//#region AmbientLight
+		const ambientLight = new THREE.AmbientLight(0xffffff, 1);
+		this.scene.add(ambientLight);
+		//#endregion
+
+		if (this.graphicsQuality !== 'cheep') {
+			//#region Room light
+			const roomLight = new THREE.SpotLight(0xffffff, 0.1);
+
+			roomLight.position.set(0, 8, 0);
+			roomLight.castShadow = this.enableShadow;
+			roomLight.shadow.bias = -0.0001;
+			roomLight.shadow.mapSize.width = this.shadowQuality;
+			roomLight.shadow.mapSize.height = this.shadowQuality;
+			roomLight.shadow.camera.near = 0.1;
+			roomLight.shadow.camera.far = 9;
+			roomLight.shadow.camera.fov = 45;
+
+			this.scene.add(roomLight);
+			//#endregion
+		}
+
+		//#region Out light
+		const outLight1 = new THREE.SpotLight(0xffffff, 0.4);
+		outLight1.position.set(9, 3, -2);
+		outLight1.castShadow = this.enableShadow;
+		outLight1.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight1.shadow.mapSize.width = this.shadowQuality;
+		outLight1.shadow.mapSize.height = this.shadowQuality;
+		outLight1.shadow.camera.near = 6;
+		outLight1.shadow.camera.far = 15;
+		outLight1.shadow.camera.fov = 45;
+		this.scene.add(outLight1);
+
+		const outLight2 = new THREE.SpotLight(0xffffff, 0.2);
+		outLight2.position.set(-2, 3, 9);
+		outLight2.castShadow = false;
+		outLight2.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight2.shadow.camera.near = 6;
+		outLight2.shadow.camera.far = 15;
+		outLight2.shadow.camera.fov = 45;
+		this.scene.add(outLight2);
+		//#endregion
+
+		//#region Init a controller
+		this.controls = new OrbitControls(this.camera, this.canvas);
+
+		this.controls.target.set(0, 1, 0);
+		this.controls.enableZoom = true;
+		this.controls.enablePan = isMyRoom;
+		this.controls.minPolarAngle = 0;
+		this.controls.maxPolarAngle = Math.PI / 2;
+		this.controls.minAzimuthAngle = 0;
+		this.controls.maxAzimuthAngle = Math.PI / 2;
+		this.controls.enableDamping = true;
+		this.controls.dampingFactor = 0.2;
+		this.controls.mouseButtons.LEFT = 1;
+		this.controls.mouseButtons.MIDDLE = 2;
+		this.controls.mouseButtons.RIGHT = 0;
+		//#endregion
+
+		//#region POST FXs
+		if (!this.usePostFXs) {
+			this.composer = null;
+		} else {
+			const renderTarget = new THREE.WebGLRenderTarget(width, height, {
+				minFilter: THREE.LinearFilter,
+				magFilter: THREE.LinearFilter,
+				format: THREE.RGBFormat,
+				stencilBuffer: false,
+			});
+
+			const fxaa = new ShaderPass(FXAAShader);
+			fxaa.uniforms['resolution'].value = new THREE.Vector2(1 / width, 1 / height);
+			fxaa.renderToScreen = true;
+
+			this.composer = new EffectComposer(this.renderer, renderTarget);
+			this.composer.addPass(new RenderPass(this.scene, this.camera));
+			if (this.graphicsQuality === 'ultra') {
+				this.composer.addPass(new BloomPass(0.25, 30, 128.0, 512));
+			}
+			this.composer.addPass(fxaa);
+		}
+		//#endregion
+		//#endregion
+
+		//#region Label
+		//#region Avatar
+		const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`;
+
+		const textureLoader = new THREE.TextureLoader();
+		textureLoader.crossOrigin = 'anonymous';
+
+		const iconTexture = textureLoader.load(avatarUrl);
+		iconTexture.wrapS = THREE.RepeatWrapping;
+		iconTexture.wrapT = THREE.RepeatWrapping;
+		iconTexture.anisotropy = 16;
+
+		const avatarMaterial = new THREE.MeshBasicMaterial({
+			map: iconTexture,
+			side: THREE.DoubleSide,
+			alphaTest: 0.5
+		});
+
+		const iconGeometry = new THREE.PlaneGeometry(1, 1);
+
+		const avatarObject = new THREE.Mesh(iconGeometry, avatarMaterial);
+		avatarObject.position.set(-3, 2.5, 2);
+		avatarObject.rotation.y = Math.PI / 2;
+		avatarObject.castShadow = false;
+
+		this.scene.add(avatarObject);
+		//#endregion
+
+		//#region Username
+		const name = user.username;
+
+		new THREE.FontLoader().load('/assets/fonts/helvetiker_regular.typeface.json', font => {
+			const nameGeometry = new THREE.TextGeometry(name, {
+				size: 0.5,
+				height: 0,
+				curveSegments: 8,
+				font: font,
+				bevelThickness: 0,
+				bevelSize: 0,
+				bevelEnabled: false
+			});
+
+			const nameMaterial = new THREE.MeshLambertMaterial({
+				color: 0xffffff
+			});
+
+			const nameObject = new THREE.Mesh(nameGeometry, nameMaterial);
+			nameObject.position.set(-3, 2.25, 1.25);
+			nameObject.rotation.y = Math.PI / 2;
+			nameObject.castShadow = false;
+
+			this.scene.add(nameObject);
+		});
+		//#endregion
+		//#endregion
+
+		//#region Interaction
+		if (isMyRoom) {
+			this.furnitureControl = new TransformControls(this.camera, this.canvas);
+			this.scene.add(this.furnitureControl);
+
+			// Hover highlight
+			this.canvas.onmousemove = this.onmousemove;
+
+			// Click
+			this.canvas.onmousedown = this.onmousedown;
+		}
+		//#endregion
+
+		//#region Init room
+		this.loadRoom();
+		//#endregion
+
+		//#region Load furnitures
+		for (const furniture of this.furnitures) {
+			this.loadFurniture(furniture).then(obj => {
+				this.scene.add(obj.scene);
+				this.objects.push(obj.scene);
+			});
+		}
+		//#endregion
+
+		// Start render
+		if (this.usePostFXs) {
+			this.renderWithPostFXs();
+		} else {
+			this.renderWithoutPostFXs();
+		}
+	}
+
+	@autobind
+	private renderWithoutPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithoutPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.render(this.scene, this.camera);
+	}
+
+	@autobind
+	private renderWithPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.clear();
+		this.composer.render();
+	}
+
+	@autobind
+	private loadRoom() {
+		const type = this.roomInfo.roomType;
+		new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => {
+			gltf.scene.traverse(child => {
+				if (!(child instanceof THREE.Mesh)) return;
+
+				child.receiveShadow = this.enableShadow;
+
+				child.material = new THREE.MeshLambertMaterial({
+					color: (child.material as THREE.MeshStandardMaterial).color,
+					map: (child.material as THREE.MeshStandardMaterial).map,
+					name: (child.material as THREE.MeshStandardMaterial).name,
+				});
+
+				// 異方性フィルタリング
+				if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') {
+					(child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.anisotropy = 8;
+				}
+			});
+
+			gltf.scene.position.set(0, 0, 0);
+
+			this.scene.add(gltf.scene);
+			this.roomObj = gltf.scene;
+			if (this.roomInfo.roomType === 'default') {
+				this.applyCarpetColor();
+			}
+		});
+	}
+
+	@autobind
+	private loadFurniture(furniture: Furniture) {
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		return new Promise<GLTF>((res, rej) => {
+			const loader = new GLTFLoader();
+			loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => {
+				const model = gltf.scene;
+
+				// Load animation
+				if (gltf.animations.length > 0) {
+					const mixer = new THREE.AnimationMixer(model);
+					this.mixers.push(mixer);
+					for (const clip of gltf.animations) {
+						mixer.clipAction(clip).play();
+					}
+				}
+
+				model.name = furniture.id;
+				model.position.x = furniture.position.x;
+				model.position.y = furniture.position.y;
+				model.position.z = furniture.position.z;
+				model.rotation.x = furniture.rotation.x;
+				model.rotation.y = furniture.rotation.y;
+				model.rotation.z = furniture.rotation.z;
+
+				model.traverse(child => {
+					if (!(child instanceof THREE.Mesh)) return;
+					child.castShadow = this.enableShadow;
+					child.receiveShadow = this.enableShadow;
+					(child.material as THREE.MeshStandardMaterial).metalness = 0;
+
+					// 異方性フィルタリング
+					if ((child.material as THREE.MeshStandardMaterial).map && this.graphicsQuality !== 'cheep') {
+						(child.material as THREE.MeshStandardMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.anisotropy = 8;
+					}
+				});
+
+				if (def.color) { // カスタムカラー
+					this.applyCustomColor(model);
+				}
+
+				if (def.texture) { // カスタムテクスチャ
+					this.applyCustomTexture(model);
+				}
+
+				res(gltf);
+			}, null, rej);
+		});
+	}
+
+	@autobind
+	private applyCarpetColor() {
+		this.roomObj.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			if (child.material &&
+				(child.material as THREE.MeshStandardMaterial).name &&
+				(child.material as THREE.MeshStandardMaterial).name === 'Carpet'
+			) {
+				const colorHex = parseInt(this.roomInfo.carpetColor.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
+			}
+		});
+	}
+
+	@autobind
+	private applyCustomColor(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.color == null) return;
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.color)) {
+				if (!child.material ||
+					!(child.material as THREE.MeshStandardMaterial).name ||
+					(child.material as THREE.MeshStandardMaterial).name !== t
+				) continue;
+
+				const prop = def.color[t];
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				const colorHex = parseInt(val.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
+			}
+		});
+	}
+
+	@autobind
+	private applyCustomTexture(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.texture == null) return;
+
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.texture)) {
+				if (child.name !== t) continue;
+
+				const prop = def.texture[t].prop;
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				const canvas = document.createElement('canvas');
+				canvas.height = 1024;
+				canvas.width = 1024;
+
+				child.material = new THREE.MeshLambertMaterial({
+					emissive: 0x111111,
+					side: THREE.DoubleSide,
+					alphaTest: 0.5,
+				});
+
+				const img = new Image();
+				img.crossOrigin = 'anonymous';
+				img.onload = () => {
+					const uvInfo = def.texture[t].uv;
+
+					const ctx = canvas.getContext('2d');
+					ctx.drawImage(img,
+						0, 0, img.width, img.height,
+						uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);
+
+					const texture = new THREE.Texture(canvas);
+					texture.wrapS = THREE.RepeatWrapping;
+					texture.wrapT = THREE.RepeatWrapping;
+					texture.anisotropy = 16;
+					texture.flipY = false;
+
+					(child.material as THREE.MeshLambertMaterial).map = texture;
+					(child.material as THREE.MeshLambertMaterial).needsUpdate = true;
+					(child.material as THREE.MeshLambertMaterial).map.needsUpdate = true;
+				};
+				img.src = val;
+			}
+		});
+	}
+
+	@autobind
+	private onmousemove(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			if (this.isSelectedObject(object)) continue;
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const intersected = this.getRoot(intersects[0].object);
+			if (this.isSelectedObject(intersected)) return;
+			intersected.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919);
+				}
+			});
+		}
+	}
+
+	@autobind
+	private onmousedown(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+		if (ev.target !== this.canvas || ev.button !== 0) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const selectedObj = this.getRoot(intersects[0].object);
+			this.selectFurniture(selectedObj);
+		} else {
+			this.selectedObject = null;
+			this.onChangeSelect(null);
+		}
+	}
+
+	@autobind
+	private getRoot(obj: THREE.Object3D): THREE.Object3D {
+		let found = false;
+		let x = obj.parent;
+		while (!found) {
+			if (x.parent.parent == null) {
+				found = true;
+			} else {
+				x = x.parent;
+			}
+		}
+		return x;
+	}
+
+	@autobind
+	private isSelectedObject(obj: THREE.Object3D): boolean {
+		if (this.selectedObject == null) {
+			return false;
+		} else {
+			return obj.name === this.selectedObject.name;
+		}
+	}
+
+	@autobind
+	private selectFurniture(obj: THREE.Object3D) {
+		this.selectedObject = obj;
+		this.onChangeSelect(obj);
+		obj.traverse(child => {
+			if (child instanceof THREE.Mesh) {
+				(child.material as THREE.MeshStandardMaterial).emissive.setHex(0xff0000);
+			}
+		});
+	}
+
+	/**
+	 * 家具の移動/回転モードにします
+	 * @param type 移動か回転か
+	 */
+	@autobind
+	public enterTransformMode(type: 'translate' | 'rotate') {
+		this.isTransformMode = true;
+		this.furnitureControl.setMode(type);
+		this.furnitureControl.attach(this.selectedObject);
+	}
+
+	/**
+	 * 家具の移動/回転モードを終了します
+	 */
+	@autobind
+	public exitTransformMode() {
+		this.isTransformMode = false;
+		this.furnitureControl.detach();
+	}
+
+	/**
+	 * 家具プロパティを更新します
+	 * @param key プロパティ名
+	 * @param value 値
+	 */
+	@autobind
+	public updateProp(key: string, value: any) {
+		const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name);
+		if (furniture.props == null) furniture.props = {};
+		furniture.props[key] = value;
+		this.applyCustomColor(this.selectedObject);
+		this.applyCustomTexture(this.selectedObject);
+	}
+
+	/**
+	 * 部屋に家具を追加します
+	 * @param type 家具の種類
+	 */
+	@autobind
+	public addFurniture(type: string) {
+		const furniture = {
+			id: uuid(),
+			type: type,
+			position: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+			rotation: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+		};
+
+		this.furnitures.push(furniture);
+
+		this.loadFurniture(furniture).then(obj => {
+			this.scene.add(obj.scene);
+			this.objects.push(obj.scene);
+		});
+	}
+
+	/**
+	 * 現在選択されている家具を部屋から削除します
+	 */
+	@autobind
+	public removeFurniture() {
+		this.exitTransformMode();
+		const obj = this.selectedObject;
+		this.scene.remove(obj);
+		this.objects = this.objects.filter(object => object.name !== obj.name);
+		this.furnitures = this.furnitures.filter(furniture => furniture.id !== obj.name);
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	/**
+	 * 全ての家具を部屋から削除します
+	 */
+	@autobind
+	public removeAllFurnitures() {
+		this.exitTransformMode();
+		for (const obj of this.objects) {
+			this.scene.remove(obj);
+		}
+		this.objects = [];
+		this.furnitures = [];
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	/**
+	 * 部屋の床の色を変更します
+	 * @param color 色
+	 */
+	@autobind
+	public updateCarpetColor(color: string) {
+		this.roomInfo.carpetColor = color;
+		this.applyCarpetColor();
+	}
+
+	/**
+	 * 部屋の種類を変更します
+	 * @param type 種類
+	 */
+	@autobind
+	public changeRoomType(type: string) {
+		this.roomInfo.roomType = type;
+		this.scene.remove(this.roomObj);
+		this.loadRoom();
+	}
+
+	/**
+	 * 部屋データを取得します
+	 */
+	@autobind
+	public getRoomInfo() {
+		for (const obj of this.objects) {
+			const furniture = this.furnitures.find(f => f.id === obj.name);
+			furniture.position.x = obj.position.x;
+			furniture.position.y = obj.position.y;
+			furniture.position.z = obj.position.z;
+			furniture.rotation.x = obj.rotation.x;
+			furniture.rotation.y = obj.rotation.y;
+			furniture.rotation.z = obj.rotation.z;
+		}
+
+		return this.roomInfo;
+	}
+
+	/**
+	 * 選択されている家具を取得します
+	 */
+	@autobind
+	public getSelectedObject() {
+		return this.selectedObject;
+	}
+
+	@autobind
+	public findFurnitureById(id: string) {
+		return this.furnitures.find(furniture => furniture.id === id);
+	}
+
+	/**
+	 * レンダリングを終了します
+	 */
+	@autobind
+	public destroy() {
+		// Stop render loop
+		window.cancelAnimationFrame(this.renderFrameRequestId);
+
+		this.controls.dispose();
+		this.scene.dispose();
+	}
+}
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@ -28,9 +28,9 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as emojilib from 'emojilib';
+import { emojilist } from '../../../../../misc/emojilist';
 import contains from '../../../common/scripts/contains';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';

 type EmojiDef = {
@ -41,9 +41,7 @@ type EmojiDef = {
 	isCustomEmoji?: boolean;
 };

-const lib = Object.entries(emojilib.lib).filter((x: any) => {
-	return x[1].category != 'flags';
-});
+const lib = emojilist.filter(x => x.category !== 'flags');

 const char2file = (char: string) => {
 	let codes = Array.from(char).map(x => x.codePointAt(0).toString(16));
@ -52,21 +50,21 @@ const char2file = (char: string) => {
 	return codes.join('-');
 };

-const emjdb: EmojiDef[] = lib.map((x: any) => ({
-	emoji: x[1].char,
-	name: x[0],
+const emjdb: EmojiDef[] = lib.map(x => ({
+	emoji: x.char,
+	name: x.name,
 	aliasOf: null,
-	url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+	url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 }));

-for (const x of lib as any) {
-	if (x[1].keywords) {
-		for (const k of x[1].keywords) {
+for (const x of lib) {
+	if (x.keywords) {
+		for (const k of x.keywords) {
 			emjdb.push({
-				emoji: x[1].char,
+				emoji: x.char,
 				name: k,
-				aliasOf: x[0],
-				url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+				aliasOf: x.name,
+				url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 			});
 		}
 	}
@ -85,7 +83,7 @@ export default Vue.extend({
 			hashtags: [],
 			emojis: [],
 			select: -1,
-			emojilib,
+			emojilist,
 			emojiDb: [] as EmojiDef[]
 		}
 	},
--- a/src/client/app/common/views/components/code-core.vue
+++ b/src/client/app/common/views/components/code-core.vue
@ -1,16 +1,16 @@
 <template>
-<prism :inline="inline" :language="lang || 'js'">{{ code }}</prism>
+<x-prism :inline="inline" :language="prismLang">{{ code }}</x-prism>
 </template>

 <script lang="ts">
 import Vue from 'vue';
 import 'prismjs';
 import 'prismjs/themes/prism-okaidia.css';
-import Prism from 'vue-prism-component';
+import XPrism from 'vue-prism-component';

 export default Vue.extend({
 	components: {
-		Prism
+		XPrism
 	},
 	props: {
 		code: {
@ -25,6 +25,12 @@ export default Vue.extend({
 			type: Boolean,
 			required: false
 		}
+	},
+
+	computed: {
+		prismLang() {
+			return Prism.languages[this.lang] ? this.lang : 'js';
+		}
 	}
 });
 </script>
--- a/src/client/app/common/views/components/connect-failed.vue
+++ b/src/client/app/common/views/components/connect-failed.vue
@ -1,6 +1,6 @@
 <template>
 <div class="mk-connect-failed">
-	<img src="https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg" alt=""/>
+	<img src="/assets/error.jpg" onerror="this.src='https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg';" alt=""/>
 	<h1>{{ $t('title') }}</h1>
 	<p class="text">
 		<span>{{ this.$t('description').substr(0, this.$t('description').indexOf('{')) }}</span>
--- a/src/client/app/common/views/components/dialog.vue
+++ b/src/client/app/common/views/components/dialog.vue
@ -98,7 +98,7 @@ export default Vue.extend({
 		return {
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
-			selectedValue: this.select ? this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
+			selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
 			canOk: true,
 			faTimesCircle, faQuestionCircle
 		};
--- a/src/client/app/common/views/components/drive-file-thumbnail.vue
+++ b/src/client/app/common/views/components/drive-file-thumbnail.vue
@ -57,7 +57,8 @@ export default Vue.extend({
 		},
 		fit: {
 			type: String,
-			required: true
+			required: false,
+			default: 'cover'
 		},
 		detail: {
 			type: Boolean,
--- a/src/client/app/common/views/components/emoji-picker.vue
+++ b/src/client/app/common/views/components/emoji-picker.vue
@ -5,6 +5,7 @@
 			:title="category.text"
 			@click="go(category)"
 			:class="{ active: category.isActive }"
+			:key="category.text"
 		>
 			<fa :icon="category.icon" fixed-width/>
 		</button>
@ -12,18 +13,19 @@
 	<div class="emojis">
 		<header><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
 		<div v-if="categories.find(x => x.isActive).name">
-			<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === categories.find(x => x.isActive).name)"
-				:title="emoji[0]"
-				@click="chosen(emoji[1].char)"
-				:key="emoji[0]"
+			<button v-for="emoji in emojilist.filter(e => e.category === categories.find(x => x.isActive).name)"
+				:title="emoji.name"
+				@click="chosen(emoji.char)"
+				:key="emoji.name"
 			>
-				<mk-emoji :emoji="emoji[1].char"/>
+				<mk-emoji :emoji="emoji.char"/>
 			</button>
 		</div>
 		<div v-else>
 			<button v-for="emoji in customEmojis"
 				:title="emoji.name"
 				@click="chosen(`:${emoji.name}:`)"
+				:key="emoji.name"
 			>
 				<img :src="emoji.url" :alt="emoji.name"/>
 			</button>
@ -35,7 +37,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { lib } from 'emojilib';
+import { emojilist } from '../../../../../misc/emojilist';
 import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';

@ -44,7 +46,7 @@ export default Vue.extend({

 	data() {
 		return {
-			lib,
+			emojilist,
 			customEmojis: [],
 			categories: [{
 				text: this.$t('custom-emoji'),
--- a/src/client/app/common/views/components/emoji.vue
+++ b/src/client/app/common/views/components/emoji.vue
@ -7,10 +7,8 @@

 <script lang="ts">
 import Vue from 'vue';
-// スクリプトサイズがデカい
-//import { lib } from 'emojilib';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';

 export default Vue.extend({
 	props: {
@ -92,7 +90,7 @@ export default Vue.extend({
 			if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
 			codes = codes.filter(x => x && x.length);

-			this.url = `${twemojiBase}/2/svg/${codes.join('-')}.svg`;
+			this.url = `${twemojiSvgBase}/${codes.join('-')}.svg`;
 		}
 	},
 });
--- a/src/client/app/common/views/components/frac.vue
+++ b/src/client/app/common/views/components/frac.vue
@ -0,0 +1,49 @@
+<template>
+<span class="mk-frac"><span>{{ pad }}</span><span>{{ value }} / {{ total }}</span></span>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n(),
+	props: {
+		value: {
+			type: Number,
+			required: true,
+		},
+		total: {
+			type: Number,
+			required: true,
+		},
+	},
+	computed: {
+		pad(this: {
+			value: number;
+			total: number;
+			length(value: number): number;
+		}) {
+			return '0'.repeat(this.length(this.total) - this.length(this.value));
+		},
+	},
+	methods: {
+		length(value: number) {
+			const string = value.toString();
+
+			return string.includes('e') ? -~string.substr(string.indexOf('e')) : string.length;
+		},
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-frac
+	-webkit-font-feature-settings 'tnum'
+	-moz-font-feature-settings 'tnum'
+	font-feature-settings 'tnum'
+	font-variant-numeric tabular-nums
+
+	> :first-child
+		visibility hidden
+</style>
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@ -33,6 +33,7 @@ import fileTypeIcon from './file-type-icon.vue';
 import emoji from './emoji.vue';
 import welcomeTimeline from './welcome-timeline.vue';
 import userList from './user-list.vue';
+import frac from './frac.vue';
 import uiInput from './ui/input.vue';
 import uiButton from './ui/button.vue';
 import uiHorizonGroup from './ui/horizon-group.vue';
@ -82,6 +83,7 @@ Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-emoji', emoji);
 Vue.component('mk-welcome-timeline', welcomeTimeline);
 Vue.component('mk-user-list', userList);
+Vue.component('mk-frac', frac);
 Vue.component('ui-input', uiInput);
 Vue.component('ui-button', uiButton);
 Vue.component('ui-horizon-group', uiHorizonGroup);
--- a/src/client/app/common/views/components/media-image.vue
+++ b/src/client/app/common/views/components/media-image.vue
@ -59,9 +59,12 @@ export default Vue.extend({
 	},
 	methods: {
 		onClick() {
-			this.$root.new(ImageViewer, {
+			const viewer = this.$root.new(ImageViewer, {
 				image: this.image
 			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 });
--- a/src/client/app/common/views/components/media-list.vue
+++ b/src/client/app/common/views/components/media-list.vue
@ -35,7 +35,8 @@ export default Vue.extend({
 	mounted() {
 		//#region for Safari bug
 		if (this.$refs.grid) {
-			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px` : '128px';
+			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px`
+				: this.$store.state.device.inDeckMode ? '128px' : this.$root.isMobile ? '173px' : '287px';
 		}
 		//#endregion
 	},
--- a/src/client/app/common/views/components/mention.vue
+++ b/src/client/app/common/views/components/mention.vue
@ -1,11 +1,17 @@
 <template>
-<router-link class="ldlomzub" :to="`/${ canonical }`" v-user-preview="canonical">
+<router-link class="ldlomzub" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
 	<span class="me" v-if="isMe">{{ $t('@.you') }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </router-link>
+<a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
+	<span class="main">
+		<span class="username">@{{ username }}</span>
+		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }">@{{ toUnicode(host) }}</span>
+	</span>
+</a>
 </template>

 <script lang="ts">
@ -32,6 +38,15 @@ export default Vue.extend({
 		};
 	},
 	computed: {
+		url(): string {
+			switch (this.host) {
+				case 'twitter.com':
+				case 'github.com':
+					return `https://${this.host}/${this.username}`;
+				default:
+					return `/${this.canonical}`;
+			}
+		},
 		canonical(): string {
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@ -139,6 +139,7 @@ export default Vue.extend({
 					cursor pointer

 			> .content
+				max-width 100%

 				> .is-deleted
 					display block
@ -155,6 +156,7 @@ export default Vue.extend({
 					padding 8px 16px
 					overflow hidden
 					overflow-wrap break-word
+					word-break break-word
 					font-size 1em
 					color rgba(#000, 0.8)

--- a/src/client/app/common/views/components/misskey-flavored-markdown.vue
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue
@ -30,6 +30,7 @@ export default Vue.extend({
 		border-radius 4px

 	>>> .quote
+		display block
 		margin 8px
 		padding 6px 0 6px 12px
 		color var(--mfmQuote)
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@ -22,66 +22,95 @@ export default Vue.extend({
 	},
 	computed: {
 		items(): any[] {
-			return [{
-				icon: 'at',
-				text: this.$t('mention'),
-				action: this.mention
-			}, null, {
-				icon: 'info-circle',
-				text: this.$t('detail'),
-				action: this.detail
-			}, {
-				icon: faCopy,
-				text: this.$t('copy-content'),
-				action: this.copyContent
-			}, {
-				icon: 'link',
-				text: this.$t('copy-link'),
-				action: this.copyLink
-			}, this.note.uri ? {
-				icon: 'external-link-square-alt',
-				text: this.$t('remote'),
-				action: () => {
-					window.open(this.note.uri, '_blank');
-				}
-			} : undefined,
-			null,
-			this.isFavorited ? {
-				icon: 'star',
-				text: this.$t('unfavorite'),
-				action: () => this.toggleFavorite(false)
-			} : {
-				icon: 'star',
-				text: this.$t('favorite'),
-				action: () => this.toggleFavorite(true)
-			},
-			this.note.userId != this.$store.state.i.id ? this.isWatching ? {
-				icon: faEyeSlash,
-				text: this.$t('unwatch'),
-				action: () => this.toggleWatch(false)
-			} : {
-				icon: faEye,
-				text: this.$t('watch'),
-				action: () => this.toggleWatch(true)
-			} : undefined,
-			this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
-				icon: 'thumbtack',
-				text: this.$t('unpin'),
-				action: () => this.togglePin(false)
-			} : {
-				icon: 'thumbtack',
-				text: this.$t('pin'),
-				action: () => this.togglePin(true)
-			} : undefined,
-			...(this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [
-				null, {
-					icon: ['far', 'trash-alt'],
-					text: this.$t('delete'),
-					action: this.del
-				}]
-				: []
-			)]
-			.filter(x => x !== undefined)
+			if (this.$store.getters.isSignedIn) {
+				return [{
+					icon: 'at',
+					text: this.$t('mention'),
+					action: this.mention
+				}, null, {
+					icon: 'info-circle',
+					text: this.$t('detail'),
+					action: this.detail
+				}, {
+					icon: faCopy,
+					text: this.$t('copy-content'),
+					action: this.copyContent
+				}, {
+					icon: 'link',
+					text: this.$t('copy-link'),
+					action: this.copyLink
+				}, this.note.uri ? {
+					icon: 'external-link-square-alt',
+					text: this.$t('remote'),
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				} : undefined,
+				null,
+				this.isFavorited ? {
+					icon: 'star',
+					text: this.$t('unfavorite'),
+					action: () => this.toggleFavorite(false)
+				} : {
+					icon: 'star',
+					text: this.$t('favorite'),
+					action: () => this.toggleFavorite(true)
+				},
+				this.note.userId != this.$store.state.i.id ? this.isWatching ? {
+					icon: faEyeSlash,
+					text: this.$t('unwatch'),
+					action: () => this.toggleWatch(false)
+				} : {
+					icon: faEye,
+					text: this.$t('watch'),
+					action: () => this.toggleWatch(true)
+				} : undefined,
+				this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
+					icon: 'thumbtack',
+					text: this.$t('unpin'),
+					action: () => this.togglePin(false)
+				} : {
+					icon: 'thumbtack',
+					text: this.$t('pin'),
+					action: () => this.togglePin(true)
+				} : undefined,
+				...(this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [
+					null,
+					this.note.userId == this.$store.state.i.id ? {
+						icon: 'undo-alt',
+						text: this.$t('delete-and-edit'),
+						action: this.deleteAndEdit
+					} : undefined,
+					{
+						icon: ['far', 'trash-alt'],
+						text: this.$t('delete'),
+						action: this.del
+					}]
+					: []
+				)]
+				.filter(x => x !== undefined);
+			} else {
+				return [{
+					icon: 'info-circle',
+					text: this.$t('detail'),
+					action: this.detail
+				}, {
+					icon: faCopy,
+					text: this.$t('copy-content'),
+					action: this.copyContent
+				}, {
+					icon: 'link',
+					text: this.$t('copy-link'),
+					action: this.copyLink
+				}, this.note.uri ? {
+					icon: 'external-link-square-alt',
+					text: this.$t('remote'),
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				} : undefined]
+				.filter(x => x !== undefined);
+			}
 		}
 	},

@ -154,6 +183,25 @@ export default Vue.extend({
 			});
 		},

+		deleteAndEdit() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('delete-and-edit-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				this.$root.api('notes/delete', {
+					noteId: this.note.id
+				}).then(() => {
+					this.destroyDom();
+				});
+				this.$post({
+					initialNote: this.note,
+					reply: this.note.reply,
+				});
+			});
+		},
+
 		toggleFavorite(favorite: boolean) {
 			this.$root.api(favorite ? 'notes/favorites/create' : 'notes/favorites/delete', {
 				noteId: this.note.id
@ -179,6 +227,7 @@ export default Vue.extend({
 		},

 		closed() {
+			this.$emit('closed');
 			this.$nextTick(() => {
 				this.destroyDom();
 			});
--- a/src/client/app/common/views/components/poll-editor.vue
+++ b/src/client/app/common/views/components/poll-editor.vue
@ -26,13 +26,19 @@
 				<option value="after">{{ $t('after') }}</option>
 			</ui-select>
 			<section v-if="expiration === 'at'">
-				<ui-input v-model="atDate" type="date">{{ $t('deadline-date') }}</ui-input>
-				<ui-input v-model="atTime" type="time">{{ $t('deadline-time') }}</ui-input>
+				<ui-input v-model="atDate" type="date">
+					<template #title>{{ $t('deadline-date') }}</template>
+				</ui-input>
+				<ui-input v-model="atTime" type="time">
+					<template #title>{{ $t('deadline-time') }}</template>
+				</ui-input>
 			</section>
 			<section v-if="expiration === 'after'">
-				<ui-input v-model="after" type="number">{{ $t('interval') }}</ui-input>
+				<ui-input v-model="after" type="number">
+					<template #title>{{ $t('interval') }}</template>
+				</ui-input>
 				<ui-select v-model="unit">
-					<template #label>{{ $t('unit') }}</template>
+					<template #title>{{ $t('unit') }}</template>
 					<option value="second">{{ $t('second') }}</option>
 					<option value="minute">{{ $t('minute') }}</option>
 					<option value="hour">{{ $t('hour') }}</option>
@ -46,9 +52,11 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as moment from 'moment';
 import i18n from '../../../i18n';
 import { erase } from '../../../../../prelude/array';
+import { addTimespan } from '../../../../../prelude/time';
+import { formatDateTimeString } from '../../../../../misc/format-time-string';
+
 export default Vue.extend({
 	i18n: i18n('common/views/components/poll-editor.vue'),
 	data() {
@ -56,7 +64,7 @@ export default Vue.extend({
 			choices: ['', ''],
 			multiple: false,
 			expiration: 'infinite',
-			atDate: moment().add(1, 'day').toISOString().split('T')[0],
+			atDate: formatDateTimeString(addTimespan(new Date(), 1, 'days'), 'yyyy-MM-dd'),
 			atTime: '00:00',
 			after: 0,
 			unit: 'second'
@ -89,7 +97,7 @@ export default Vue.extend({

 		get() {
 			const at = () => {
-				return moment(`${this.atDate} ${this.atTime}`).valueOf();
+				return new Date(`${this.atDate} ${this.atTime}`).getTime();
 			};

 			const after = () => {
--- a/src/client/app/common/views/components/post-form-attaches.vue
+++ b/src/client/app/common/views/components/post-form-attaches.vue
@ -36,7 +36,7 @@ export default Vue.extend({
 			required: true
 		},
 		detachMediaFn: {
-			type: Object,
+			type: Function,
 			required: false
 		}
 	},
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@ -4,16 +4,7 @@
 	<div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover">
 		<p v-if="!$root.isMobile">{{ title }}</p>
 		<div class="buttons" ref="buttons" :class="{ showFocus }">
-			<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" :title="$t('@.reactions.like')" v-particle><mk-reaction-icon reaction="like"/></button>
-			<button @click="react('love')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="2" :title="$t('@.reactions.love')" v-particle><mk-reaction-icon reaction="love"/></button>
-			<button @click="react('laugh')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="3" :title="$t('@.reactions.laugh')" v-particle><mk-reaction-icon reaction="laugh"/></button>
-			<button @click="react('hmm')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="4" :title="$t('@.reactions.hmm')" v-particle><mk-reaction-icon reaction="hmm"/></button>
-			<button @click="react('surprise')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="5" :title="$t('@.reactions.surprise')" v-particle><mk-reaction-icon reaction="surprise"/></button>
-			<button @click="react('congrats')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="6" :title="$t('@.reactions.congrats')" v-particle><mk-reaction-icon reaction="congrats"/></button>
-			<button @click="react('angry')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="7" :title="$t('@.reactions.angry')" v-particle><mk-reaction-icon reaction="angry"/></button>
-			<button @click="react('confused')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="8" :title="$t('@.reactions.confused')" v-particle><mk-reaction-icon reaction="confused"/></button>
-			<button @click="react('rip')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="9" :title="$t('@.reactions.rip')" v-particle><mk-reaction-icon reaction="rip"/></button>
-			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" :title="$t('@.reactions.pudding')" v-particle><mk-reaction-icon reaction="pudding"/></button>
+			<button v-for="(reaction, i) in $store.state.settings.reactions" :key="reaction" @click="react(reaction)" @mouseover="onMouseover" @mouseout="onMouseout" :tabindex="i + 1" :title="/^[a-z]+$/.test(reaction) ? $t('@.reactions.' + reaction) : reaction" v-particle><mk-reaction-icon :reaction="reaction"/></button>
 		</div>
 		<div v-if="enableEmojiReaction" class="text">
 			<input v-model="text" :placeholder="$t('input-reaction-placeholder')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
--- a/src/client/app/common/views/components/reactions-viewer.details.vue
+++ b/src/client/app/common/views/components/reactions-viewer.details.vue
@ -0,0 +1,122 @@
+<template>
+<transition name="zoom-in-top">
+	<div class="buebdbiu" ref="popover" v-if="show">
+		<i18n path="few-users" v-if="users.length <= 10">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+		<i18n path="many-users" v-if="10 < users.length">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<span slot="omitted">{{ count - 10 }}</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+	</div>
+</transition>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/reactions-viewer.details.vue'),
+	props: {
+		reaction: {
+			type: String,
+			required: true,
+		},
+		users: {
+			type: Array,
+			required: true,
+		},
+		count: {
+			type: Number,
+			required: true,
+		},
+		source: {
+			required: true,
+		}
+	},
+	data() {
+		return {
+			show: false
+		};
+	},
+	mounted() {
+		this.show = true;
+
+		this.$nextTick(() => {
+			const popover = this.$refs.popover as any;
+
+			if (this.source == null) {
+				this.destroyDom();
+				return;
+			}
+			const rect = this.source.getBoundingClientRect();
+
+			const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
+			const y = rect.top + window.pageYOffset + this.source.offsetHeight;
+			popover.style.left = (x - 28) + 'px';
+			popover.style.top = (y + 16) + 'px';
+		});
+	}
+	methods: {
+		close() {
+			this.show = false;
+			setTimeout(this.destroyDom, 300);
+		}
+	}
+})
+</script>
+
+<style lang="stylus" scoped>
+.buebdbiu
+	$bgcolor = var(--popupBg)
+	z-index 10000
+	display block
+	position absolute
+	max-width 240px
+	font-size 0.8em
+	padding 6px 8px
+	background $bgcolor
+	text-align center
+	color var(--text)
+	border-radius 4px
+	box-shadow 0 var(--lineWidth) 4px rgba(#000, 0.25)
+	pointer-events none
+	transform-origin center -16px
+
+	&:before
+		content ""
+		pointer-events none
+		display block
+		position absolute
+		top -28px
+		left 12px
+		border-top solid 14px transparent
+		border-right solid 14px transparent
+		border-bottom solid 14px rgba(#000, 0.1)
+		border-left solid 14px transparent
+
+	&:after
+		content ""
+		pointer-events none
+		display block
+		position absolute
+		top -27px
+		left 12px
+		border-top solid 14px transparent
+		border-right solid 14px transparent
+		border-bottom solid 14px $bgcolor
+		border-left solid 14px transparent
+</style>
--- a/src/client/app/common/views/components/reactions-viewer.reaction.vue
+++ b/src/client/app/common/views/components/reactions-viewer.reaction.vue
@ -5,6 +5,9 @@
 	@click="toggleReaction(reaction)"
 	v-if="count > 0"
 	v-particle="!isMe"
+	@mouseover="onMouseover"
+	@mouseleave="onMouseleave"
+	ref="reaction"
 >
 	<mk-reaction-icon :reaction="reaction" ref="icon"/>
 	<span>{{ count }}</span>
@ -15,6 +18,7 @@
 import Vue from 'vue';
 import Icon from './reaction-icon.vue';
 import anime from 'animejs';
+import XDetails from './reactions-viewer.details.vue';

 export default Vue.extend({
 	props: {
@ -26,6 +30,10 @@ export default Vue.extend({
 			type: Number,
 			required: true,
 		},
+		isInitial: {
+			type: Boolean,
+			required: true,
+		},
 		note: {
 			type: Object,
 			required: true,
@ -36,14 +44,25 @@ export default Vue.extend({
 			default: true,
 		},
 	},
+	data() {
+		return {
+			details: null,
+			detailsTimeoutId: null,
+			isHovering: false
+		};
+	},
 	computed: {
 		isMe(): boolean {
 			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
 		},
 	},
+	mounted() {
+		if (!this.isInitial) this.anime();
+	},
 	watch: {
-		count() {
-			this.anime();
+		count(newCount, oldCount) {
+			if (oldCount < newCount) this.anime();
+			if (this.details != null) this.openDetails();
 		},
 	},
 	methods: {
@ -70,11 +89,49 @@ export default Vue.extend({
 				});
 			}
 		},
+		onMouseover() {
+			this.isHovering = true;
+			this.detailsTimeoutId = setTimeout(this.openDetails, 300);
+		},
+		onMouseleave() {
+			this.isHovering = false;
+			clearTimeout(this.detailsTimeoutId);
+			this.closeDetails();
+		},
+		openDetails() {
+			if (this.$root.isMobile) return;
+			this.$root.api('notes/reactions', {
+				noteId: this.note.id,
+				type: this.reaction,
+				limit: 11
+			}).then((reactions: any[]) => {
+				const users = reactions
+					.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
+					.map(x => x.user);
+
+				this.closeDetails();
+				if (!this.isHovering) return;
+				this.details = this.$root.new(XDetails, {
+					reaction: this.reaction,
+					users,
+					count: this.count,
+					source: this.$refs.reaction
+				});
+			});
+		},
+		closeDetails() {
+			if (this.details != null) {
+				this.details.close();
+				this.details = null;
+			}
+		},
 		anime() {
 			if (this.$store.state.device.reduceMotion) return;
 			if (document.hidden) return;

 			this.$nextTick(() => {
+				if (this.$refs.icon == null) return;
+
 				const rect = this.$refs.icon.$el.getBoundingClientRect();

 				const x = rect.left;
@ -120,6 +177,14 @@ export default Vue.extend({
 	border-radius 4px
 	cursor pointer

+	&, *
+		-webkit-touch-callout none
+		-webkit-user-select none
+		-khtml-user-select none
+		-moz-user-select none
+		-ms-user-select none
+		user-select none
+
 	*
 		user-select none
 		pointer-events none
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@ -1,6 +1,6 @@
 <template>
 <div class="mk-reactions-viewer" :class="{ isMe }">
-	<x-reaction v-for="(count, reaction) in reactions" :reaction="reaction" :count="count" :note="note" :key="reaction"/>
+	<x-reaction v-for="(count, reaction) in note.reactions" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note" :key="reaction"/>
 </div>
 </template>

@ -12,6 +12,11 @@ export default Vue.extend({
 	components: {
 		XReaction
 	},
+	data() {
+		return {
+			initialReactions: new Set(Object.keys(this.note.reactions))
+		};
+	},
 	props: {
 		note: {
 			type: Object,
@ -19,9 +24,6 @@ export default Vue.extend({
 		},
 	},
 	computed: {
-		reactions(): any {
-			return this.note.reactions;
-		},
 		isMe(): boolean {
 			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
 		},
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/src/client/app/common/views/components/settings/profile.vue
@ -159,6 +159,14 @@ export default Vue.extend({
 			username: null,
 			location: null,
 			description: null,
+			fieldName0: null,
+			fieldValue0: null,
+			fieldName1: null,
+			fieldValue1: null,
+			fieldName2: null,
+			fieldValue2: null,
+			fieldName3: null,
+			fieldValue3: null,
 			lang: null,
 			birthday: null,
 			avatarId: null,
@ -210,16 +218,14 @@ export default Vue.extend({
 		this.carefulBot = this.$store.state.i.carefulBot;
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;

-		if (this.$store.state.i.fields) {
-			this.fieldName0 = this.$store.state.i.fields[0].name;
-			this.fieldValue0 = this.$store.state.i.fields[0].value;
-			this.fieldName1 = this.$store.state.i.fields[1].name;
-			this.fieldValue1 = this.$store.state.i.fields[1].value;
-			this.fieldName2 = this.$store.state.i.fields[2].name;
-			this.fieldValue2 = this.$store.state.i.fields[2].value;
-			this.fieldName3 = this.$store.state.i.fields[3].name;
-			this.fieldValue3 = this.$store.state.i.fields[3].value;
-		}
+		this.fieldName0 = this.$store.state.i.fields[0] ? this.$store.state.i.fields[0].name : null;
+		this.fieldValue0 = this.$store.state.i.fields[0] ? this.$store.state.i.fields[0].value : null;
+		this.fieldName1 = this.$store.state.i.fields[1] ? this.$store.state.i.fields[1].name : null;
+		this.fieldValue1 = this.$store.state.i.fields[1] ? this.$store.state.i.fields[1].value : null;
+		this.fieldName2 = this.$store.state.i.fields[2] ? this.$store.state.i.fields[2].name : null;
+		this.fieldValue2 = this.$store.state.i.fields[2] ? this.$store.state.i.fields[2].value : null;
+		this.fieldName3 = this.$store.state.i.fields[3] ? this.$store.state.i.fields[3].name : null;
+		this.fieldValue3 = this.$store.state.i.fields[3] ? this.$store.state.i.fields[3].value : null;
 	},

 	methods: {
@ -432,7 +438,5 @@ export default Vue.extend({
 	> header
 		padding 8px 0px
 		font-weight bold
-	> div
-		padding-left 16px

 </style>
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@ -47,6 +47,7 @@
 				<ui-switch v-model="disableAnimatedMfm">{{ $t('@._settings.disable-animated-mfm') }}</ui-switch>
 				<ui-switch v-model="disableShowingAnimatedImages">{{ $t('@._settings.disable-showing-animated-images') }}</ui-switch>
 				<ui-switch v-model="remainDeletedNote">{{ $t('@._settings.remain-deleted-note') }}</ui-switch>
+				<ui-switch v-model="enableMobileQuickNotificationView">{{ $t('@._settings.enable-quick-notification-view') }}</ui-switch>
 			</section>
 			<section>
 				<header>{{ $t('@._settings.line-width') }}</header>
@ -107,6 +108,13 @@
 				<ui-switch v-if="$root.isMobile" v-model="disableViaMobile">{{ $t('@._settings.disable-via-mobile') }}</ui-switch>
 			</section>

+			<section>
+				<header>{{ $t('@._settings.reactions') }}</header>
+				<ui-textarea v-model="reactions">
+					{{ $t('@._settings.reactions') }}<template #desc>{{ $t('@._settings.reactions-description') }}</template>
+				</ui-textarea>
+			</section>
+
 			<section>
 				<header>{{ $t('@._settings.timeline') }}</header>
 				<ui-switch v-model="showMyRenotes">{{ $t('@._settings.show-my-renotes') }}</ui-switch>
@ -158,6 +166,19 @@
 					<template #desc>{{ $t('@._settings.paste-dialog-desc') }}</template>
 				</ui-switch>
 			</section>
+
+			<section>
+				<header>{{ $t('@._settings.room') }}</header>
+				<ui-select v-model="roomGraphicsQuality">
+					<template #label>{{ $t('@._settings._room.graphicsQuality') }}</template>
+					<option value="ultra">{{ $t('@._settings._room._graphicsQuality.ultra') }}</option>
+					<option value="high">{{ $t('@._settings._room._graphicsQuality.high') }}</option>
+					<option value="medium">{{ $t('@._settings._room._graphicsQuality.medium') }}</option>
+					<option value="low">{{ $t('@._settings._room._graphicsQuality.low') }}</option>
+					<option value="cheep">{{ $t('@._settings._room._graphicsQuality.cheep') }}</option>
+				</ui-select>
+				<ui-switch v-model="roomUseOrthographicCamera">{{ $t('@._settings._room.useOrthographicCamera') }}</ui-switch>
+			</section>
 		</ui-card>

 		<ui-card>
@ -393,6 +414,11 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'disableViaMobile', value }); }
 		},

+		reactions: {
+			get() { return this.$store.state.settings.reactions.join('\n'); },
+			set(value: string) { this.$store.dispatch('settings/set', { key: 'reactions', value: value.trim().split('\n') }); }
+		},
+
 		useShadow: {
 			get() { return this.$store.state.device.useShadow; },
 			set(value) { this.$store.commit('device/set', { key: 'useShadow', value }); }
@ -502,6 +528,16 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'iLikeSushi', value }); }
 		},

+		roomUseOrthographicCamera: {
+			get() { return this.$store.state.device.roomUseOrthographicCamera; },
+			set(value) { this.$store.commit('device/set', { key: 'roomUseOrthographicCamera', value }); }
+		},
+
+		roomGraphicsQuality: {
+			get() { return this.$store.state.device.roomGraphicsQuality; },
+			set(value) { this.$store.commit('device/set', { key: 'roomGraphicsQuality', value }); }
+		},
+
 		games_reversi_showBoardLabels: {
 			get() { return this.$store.state.settings.gamesReversiShowBoardLabels; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiShowBoardLabels', value }); }
@ -532,6 +568,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'mobileNotificationPosition', value }); }
 		},

+		enableMobileQuickNotificationView: {
+			get() { return this.$store.state.device.enableMobileQuickNotificationView; },
+			set(value) { this.$store.commit('device/set', { key: 'enableMobileQuickNotificationView', value }); }
+		},
+
 		homeProfile: {
 			get() { return this.$store.state.device.homeProfile; },
 			set(value) { this.$store.commit('device/set', { key: 'homeProfile', value }); }
--- a/src/client/app/common/views/components/settings/tags.vue
+++ b/src/client/app/common/views/components/settings/tags.vue
@ -16,7 +16,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../../i18n';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';

 export default Vue.extend({
 	i18n: i18n('desktop/views/components/settings.tags.vue'),
--- a/src/client/app/common/views/components/settings/theme.vue
+++ b/src/client/app/common/views/components/settings/theme.vue
@ -125,7 +125,7 @@ import Vue from 'vue';
 import i18n from '../../../../i18n';
 import { lightTheme, darkTheme, builtinThemes, applyTheme, Theme } from '../../../../theme';
 import { Chrome } from 'vue-color';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import * as tinycolor from 'tinycolor2';
 import * as JSON5 from 'json5';
 import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
--- a/src/client/app/common/views/components/trends.chart.vue
+++ b/src/client/app/common/views/components/trends.chart.vue
@ -31,7 +31,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';

 export default Vue.extend({
 	props: {
--- a/src/client/app/common/views/components/ui/button.vue
+++ b/src/client/app/common/views/components/ui/button.vue
@ -64,8 +64,7 @@ export default Vue.extend({
 	methods: {
 		onMousedown(e: MouseEvent) {
 			function distance(p, q) {
-				const sqrt = Math.sqrt, pow = Math.pow;
-				return sqrt(pow(p.x - q.x, 2) + pow(p.y - q.y, 2));
+				return Math.hypot(p.x - q.x, p.y - q.y);
 			}

 			function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY) {
--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@ -6,7 +6,10 @@
 			<div class="value" ref="passwordMetar"></div>
 		</div>
 		<span class="label" ref="label"><slot></slot></span>
-		<span class="title" ref="title"><slot name="title"></slot></span>
+		<span class="title" ref="title">
+			<slot name="title"></slot>
+			<span class="warning" v-if="invalid"><fa :icon="['fa', 'exclamation-circle']"/>{{ $refs.input.validationMessage }}</span>
+		</span>
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<template v-if="type != 'file'">
 			<input v-if="debounce" ref="input"
@ -158,6 +161,7 @@ export default Vue.extend({
 		return {
 			v: this.value,
 			focused: false,
+			invalid: false,
 			passwordStrength: '',
 			id: Math.random().toString()
 		};
@ -200,6 +204,8 @@ export default Vue.extend({
 				this.passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
 				(this.$refs.passwordMetar as any).style.width = `${strength * 100}%`;
 			}
+
+			this.invalid = this.$refs.input.validity.badInput;
 		}
 	},
 	mounted() {
@ -365,6 +371,17 @@ root(fill)
 			//will-change transform
 			transform-origin top left
 			transform scale(.75)
+			white-space nowrap
+			width 133%
+			overflow hidden
+			text-overflow ellipsis
+
+			> .warning
+				margin-left 0.5em
+				color var(--infoWarnFg)
+
+				> svg
+					margin-right 0.1em

 		> input
 			display block
--- a/src/client/app/common/views/components/ui/select.vue
+++ b/src/client/app/common/views/components/ui/select.vue
@ -176,6 +176,9 @@ root(fill)
 			color rgba(#000, 0.54)
 			pointer-events none

+			&:empty
+				display none
+
 			> *
 				display block
 				min-width 16px
--- a/src/client/app/common/views/components/ui/switch.vue
+++ b/src/client/app/common/views/components/ui/switch.vue
@ -49,6 +49,7 @@ export default Vue.extend({
 	},
 	methods: {
 		toggle() {
+			if (this.disabled) return;
 			this.$emit('change', !this.checked);
 		}
 	}
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@ -1,5 +1,5 @@
 <template>
-<ui-container :body-togglable="true">
+<ui-container :body-togglable="true" :expanded="expanded">
 	<template #header><slot></slot></template>

 	<mk-error v-if="error" @retry="init()"/>
@ -18,7 +18,7 @@
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
 				</div>
-				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
+				<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
 		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
@ -50,7 +50,11 @@ export default Vue.extend({
 		iconOnly: {
 			type: Boolean,
 			default: false
-		}
+		},
+		expanded: {
+			type: Boolean,
+			default: true
+		},
 	},

 	computed: {
@ -134,7 +138,7 @@ export default Vue.extend({
 				font-size 14px
 				padding-right 40px

-			> .follow-button
+			> .koudoku-button
 				position absolute
 				top 8px
 				right 0
--- a/src/client/app/common/views/components/user-name.vue
+++ b/src/client/app/common/views/components/user-name.vue
@ -1,5 +1,5 @@
 <template>
-<mfm :text="user.name || user.username" :plain="true" :nowrap="true" :custom-emojis="user.emojis"/>
+<mfm :text="user.name || user.username" :plain="true" :nowrap="nowrap" :custom-emojis="user.emojis"/>
 </template>

 <script lang="ts">
@ -10,7 +10,11 @@ export default Vue.extend({
 		user: {
 			type: Object,
 			required: true
-		}
+		},
+		nowrap: {
+			type: Boolean,
+			default: true
+		},
 	}
 });
 </script>
--- a/src/client/app/common/views/deck/deck.column.vue
+++ b/src/client/app/common/views/deck/deck.column.vue
@ -14,7 +14,7 @@
 			<template v-if="active"><fa icon="angle-up"/></template>
 			<template v-else><fa icon="angle-down"/></template>
 		</button>
-		<span><slot name="header"></slot></span>
+		<span class="header"><slot name="header"></slot></span>
 		<span class="count" v-if="count > 0">({{ count }})</span>
 		<button v-if="!isTemporaryColumn" class="menu" ref="menu" @click.stop="showMenu"><fa icon="caret-down"/></button>
 		<button v-else class="close" @click.stop="close"><fa icon="times"/></button>
@ -395,13 +395,22 @@ export default Vue.extend({
 		&.indicate
 			box-shadow 0 3px 0 0 var(--primary)

-		> span
+		> .header
+			display inline-block
+			align-items center
+			overflow hidden
+			text-overflow ellipsis
+			white-space nowrap
+
 			[data-icon]
 				margin-right 8px

 		> .count
 			margin-left 4px
 			opacity 0.5
+		
+		> span:only-of-type
+			width 100%

 		> .toggleActive
 		> .menu
--- a/src/client/app/common/views/deck/deck.notification.vue
+++ b/src/client/app/common/views/deck/deck.notification.vue
@ -54,8 +54,8 @@
 		<div>
 			<header>
 				<fa icon="user-clock" class="icon"/>
-				<router-link :to="notification.user | userPage">
-					<mk-user-name :user="notification.user" class="name"/>
+				<router-link :to="notification.user | userPage" class="name">
+					<mk-user-name :user="notification.user"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
@ -67,8 +67,8 @@
 		<div>
 			<header>
 				<fa icon="chart-pie" class="icon"/>
-				<router-link :to="notification.user | userPage">
-					<mk-user-name :user="notification.user" class="name"/>
+				<router-link :to="notification.user | userPage" class="name">
+					<mk-user-name :user="notification.user"/>
 				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
@ -167,6 +167,10 @@ export default Vue.extend({
 					display inline-block
 					margin-right 3px

+		&.reaction
+			> div > header
+				align-items normal
+
 		&.renote
 			> div > header [data-icon]
 				color #77B255
--- a/src/client/app/common/views/deck/deck.notifications-column.vue
+++ b/src/client/app/common/views/deck/deck.notifications-column.vue
@ -1,8 +1,8 @@
 <template>
-<x-column :name="name" :column="column" :is-stacked="isStacked">
+<x-column :name="name" :column="column" :is-stacked="isStacked" :menu="menu">
 	<template #header><fa :icon="['far', 'bell']"/>{{ name }}</template>

-	<x-notifications/>
+	<x-notifications :type="column.notificationType === 'all' ? null : column.notificationType"/>
 </x-column>
 </template>

@ -30,11 +30,46 @@ export default Vue.extend({
 		}
 	},

+	data() {
+		return {
+			menu: null,
+		}
+	},
+
 	computed: {
 		name(): string {
 			if (this.column.name) return this.column.name;
 			return this.$t('@deck.notifications');
 		}
 	},
+
+	created() {
+		if (this.column.notificationType == null) {
+			this.column.notificationType = 'all';
+			this.$store.commit('updateDeckColumn', this.column);
+		}
+
+		this.menu = [{
+			icon: 'cog',
+			text: this.$t('@.notification-type'),
+			action: () => {
+				this.$root.dialog({
+					title: this.$t('@.notification-type'),
+					type: null,
+					select: {
+						items: ['all', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'].map(x => ({
+							value: x, text: this.$t('@.notification-types.' + x)
+						}))
+						default: this.column.notificationType,
+					},
+					showCancelButton: true
+				}).then(({ canceled, result: type }) => {
+					if (canceled) return;
+					this.column.notificationType = type;
+					this.$store.commit('updateDeckColumn', this.column);
+				});
+			}
+		}];
+	},
 });
 </script>
--- a/src/client/app/common/views/deck/deck.notifications.vue
+++ b/src/client/app/common/views/deck/deck.notifications.vue
@ -47,12 +47,22 @@ export default Vue.extend({
 		}),
 	],

+	props: {
+		type: {
+			type: String,
+			required: false
+		}
+	},
+
 	data() {
 		return {
 			connection: null,
 			pagination: {
 				endpoint: 'i/notifications',
 				limit: 20,
+				params: () => ({
+					includeTypes: this.type ? [this.type] : undefined
+				})
 			}
 		};
 	},
@ -69,6 +79,12 @@ export default Vue.extend({
 		}
 	},

+	watch: {
+		type() {
+			this.reload();
+		}
+	},
+
 	mounted() {
 		this.connection = this.$root.stream.useSharedConnection('main');
 		this.connection.on('notification', this.onNotification);
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/src/client/app/common/views/deck/deck.user-column.vue
@ -17,7 +17,7 @@
 				<mk-follow-button v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" class="follow" mini/>
 				<mk-avatar class="avatar" :user="user" :disable-preview="true" :key="user.id"/>
 				<router-link class="name" :to="user | userPage()">
-					<mk-user-name :user="user" :key="user.id"/>
+					<mk-user-name :user="user" :key="user.id" :nowrap="false"/>
 				</router-link>
 				<span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span>
 				<span class="followed" v-if="user.isFollowed">{{ $t('follows-you') }}</span>
@ -112,10 +112,13 @@ export default Vue.extend({
 		},

 		menu() {
-			this.$root.new(XUserMenu, {
+			const w = this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
 				user: this.user
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		}
 	}
 });
--- a/src/client/app/common/views/deck/deck.vue
+++ b/src/client/app/common/views/deck/deck.vue
@ -21,7 +21,7 @@ import i18n from '../../../i18n';
 import XColumnCore from './deck.column-core.vue';
 import Menu from '../../../common/views/components/menu.vue';

-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';

 export default Vue.extend({
 	i18n: i18n('deck'),
--- a/src/client/app/common/views/deck/deck.widgets-column.vue
+++ b/src/client/app/common/views/deck/deck.widgets-column.vue
@ -54,7 +54,7 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import XColumn from './deck.column.vue';
 import * as XDraggable from 'vuedraggable';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';

 export default Vue.extend({
 	i18n: i18n(),
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/src/client/app/common/views/directives/autocomplete.ts
@ -240,7 +240,7 @@ class Autocomplete {
 			// キャレットを戻す
 			this.vm.$nextTick(() => {
 				this.textarea.focus();
-				const pos = trimmedBefore.length + (value.startsWith(':') ? value.length : 1);
+				const pos = trimmedBefore.length + value.length;
 				this.textarea.setSelectionRange(pos, pos);
 			});
 		}
--- a/src/client/app/common/views/pages/explore.vue
+++ b/src/client/app/common/views/pages/explore.vue
@ -1,15 +1,30 @@
 <template>
 <div>
-	<ui-container :show-header="false" v-if="meta && stats">
-		<div class="kpdsmpnk" :style="{ backgroundImage: meta.bannerUrl ? `url(${meta.bannerUrl})` : null }">
-			<div>
-				<router-link to="/explore" class="title">{{ $t('explore', { host: meta.name || 'Misskey' }) }}</router-link>
-				<span>{{ $t('users-info', { users: num(stats.originalUsersCount) }) }}</span>
-			</div>
-		</div>
-	</ui-container>
+	<div class="localfedi7" v-if="meta && stats && tag == null" :style="{ backgroundImage: meta.bannerUrl ? `url(${meta.bannerUrl})` : null }">
+		<header>{{ $t('explore', { host: meta.name || 'Misskey' }) }}</header>
+		<div>{{ $t('users-info', { users: num(stats.originalUsersCount) }) }}</div>
+	</div>

-	<ui-container :body-togglable="true" :expanded="tag == null" ref="tags">
+	<template v-if="tag == null">
+		<mk-user-list :pagination="pinnedUsers" :expanded="false">
+			<fa :icon="faBookmark" fixed-width/>{{ $t('pinned-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="popularUsers" :expanded="false">
+			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="recentlyUpdatedUsers" :expanded="false">
+			<fa :icon="faCommentAlt" fixed-width/>{{ $t('recently-updated-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="recentlyRegisteredUsers" :expanded="false">
+			<fa :icon="faPlus" fixed-width/>{{ $t('recently-registered-users') }}
+		</mk-user-list>
+	</template>
+
+	<div class="localfedi7" v-if="tag == null" :style="{ backgroundImage: `url(/assets/fedi.jpg)` }">
+		<header>{{ $t('explore-fediverse') }}</header>
+	</div>
+
+	<ui-container :body-togglable="true" :expanded="false" ref="tags">
 		<template #header><fa :icon="faHashtag" fixed-width/>{{ $t('popular-tags') }}</template>

 		<div class="vxjfqztj">
@ -18,25 +33,18 @@
 		</div>
 	</ui-container>

-	<mk-user-list v-if="tag != null" :pagination="tagUsers" :key="`${tag}-local`">
+	<mk-user-list v-if="tag != null" :pagination="tagUsers" :key="`${tag}`">
 		<fa :icon="faHashtag" fixed-width/>{{ tag }}
 	</mk-user-list>
-	<mk-user-list v-if="tag != null" :pagination="tagRemoteUsers" :key="`${tag}-remote`">
-		<fa :icon="faHashtag" fixed-width/>{{ tag }} ({{ $t('federated') }})
-	</mk-user-list>
-
 	<template v-if="tag == null">
-		<mk-user-list :pagination="pinnedUsers">
-			<fa :icon="faBookmark" fixed-width/>{{ $t('pinned-users') }}
-		</mk-user-list>
-		<mk-user-list :pagination="popularUsers">
+		<mk-user-list :pagination="popularUsersF" :expanded="false">
 			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
 		</mk-user-list>
-		<mk-user-list :pagination="recentlyUpdatedUsers">
+		<mk-user-list :pagination="recentlyUpdatedUsersF" :expanded="false">
 			<fa :icon="faCommentAlt" fixed-width/>{{ $t('recently-updated-users') }}
 		</mk-user-list>
-		<mk-user-list :pagination="recentlyRegisteredUsers">
-			<fa :icon="faPlus" fixed-width/>{{ $t('recently-registered-users') }}
+		<mk-user-list :pagination="recentlyRegisteredUsersF" :expanded="false">
+			<fa :icon="faRocket" fixed-width/>{{ $t('recently-discovered-users') }}
 		</mk-user-list>
 	</template>
 </div>
@ -45,7 +53,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { faChartLine, faPlus, faHashtag } from '@fortawesome/free-solid-svg-icons';
+import { faChartLine, faPlus, faHashtag, faRocket } from '@fortawesome/free-solid-svg-icons';
 import { faBookmark, faCommentAlt } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
@ -58,6 +66,12 @@ export default Vue.extend({
 		}
 	},

+	inject: {
+		inNakedDeckColumn: {
+			default: false
+		}
+	},
+
 	data() {
 		return {
 			pinnedUsers: { endpoint: 'pinned-users' },
@ -75,12 +89,25 @@ export default Vue.extend({
 				state: 'alive',
 				sort: '+createdAt',
 			} },
+			popularUsersF: { endpoint: 'users', limit: 10, params: {
+				state: 'alive',
+				origin: 'remote',
+				sort: '+follower',
+			} },
+			recentlyUpdatedUsersF: { endpoint: 'users', limit: 10, params: {
+				origin: 'combined',
+				sort: '+updatedAt',
+			} },
+			recentlyRegisteredUsersF: { endpoint: 'users', limit: 10, params: {
+				origin: 'combined',
+				sort: '+createdAt',
+			} },
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
 			meta: null,
 			num: Vue.filter('number'),
-			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag
+			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag, faRocket
 		};
 	},

@ -91,21 +118,7 @@ export default Vue.extend({
 				limit: 30,
 				params: {
 					tag: this.tag,
-					state: 'alive',
-					origin: 'local',
-					sort: '+follower',
-				}
-			};
-		},
-
-		tagRemoteUsers(): any {
-			return {
-				endpoint: 'hashtags/users',
-				limit: 30,
-				params: {
-					tag: this.tag,
-					state: 'alive',
-					origin: 'remote',
+					origin: 'combined',
 					sort: '+follower',
 				}
 			};
@ -143,11 +156,37 @@ export default Vue.extend({
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
-	}
+	},
+
+	mounted() {
+		document.title = this.$root.instanceName;
+	},
 });
 </script>

 <style lang="stylus" scoped>
+.localfedi7
+	overflow hidden
+	background var(--face)
+	color #fff
+	text-shadow 0 0 8px #000
+	border-radius 6px
+	padding 16px
+	margin-top 16px
+	margin-bottom 16px
+	height 80px
+	background-position 50%
+	background-size cover
+	> header
+		font-size 20px
+		font-weight bold
+	> div
+		font-size 14px
+		opacity 0.8
+
+.localfedi7:first-child
+	margin-top 0
+
 .vxjfqztj
 	padding 16px

@ -156,35 +195,4 @@ export default Vue.extend({

 		&.local
 			font-weight bold
-
-.kpdsmpnk
-	min-height 100px
-	padding 16px
-	background-position center
-	background-size cover
-
-	&:before
-		content ""
-		display block
-		position absolute
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(0, 0, 0, 0.3)
-
-	> div
-		color #fff
-		text-shadow 0 0 8px #00
-
-		> .title
-			display block
-			font-size 20px
-			font-weight bold
-			color inherit
-
-		> span
-			font-size 14px
-			opacity 0.8
-
 </style>
--- a/src/client/app/common/views/pages/favorites.vue
+++ b/src/client/app/common/views/pages/favorites.vue
@ -40,5 +40,9 @@ export default Vue.extend({
 			icon: faStar
 		});
 	},
+
+	mounted() {
+		document.title = this.$root.instanceName;
+	},
 });
 </script>
--- a/src/client/app/common/views/pages/featured.vue
+++ b/src/client/app/common/views/pages/featured.vue
@ -40,5 +40,9 @@ export default Vue.extend({
 			icon: faNewspaper
 		});
 	},
+
+	mounted() {
+		document.title = this.$root.instanceName;
+	},
 });
 </script>
--- a/src/client/app/common/views/pages/follow-requests.vue
+++ b/src/client/app/common/views/pages/follow-requests.vue
@ -9,7 +9,7 @@
 						<mk-user-name :user="req.follower"/>
 					</router-link>
 					<span>
-						<a @click="accept(req.follower)">{{ $t('accept') }}</a>|<a @click="reject(req.follower)">{{ $t('reject') }}</a>
+						<a @click="accept(req.follower)">{{ $t('accept') }}</a> | <a @click="reject(req.follower)">{{ $t('reject') }}</a>
 					</span>
 				</div>
 			</sequential-entrance>
@ -70,5 +70,6 @@ export default Vue.extend({

 	> span
 		margin 0 0 0 auto
+		color var(--text)

 </style>
--- a/src/client/app/common/views/pages/page-editor/els/page-editor.el.if.vue
+++ b/src/client/app/common/views/pages/page-editor/els/page-editor.el.if.vue
@ -26,7 +26,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { faPlus, faQuestion } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../../../../../i18n';
 import XContainer from '../page-editor.container.vue';
@ -76,7 +76,7 @@ export default Vue.extend({
 			});
 			if (canceled) return;

-			const id = uuid.v4();
+			const id = uuid();
 			this.value.children.push({ id, type });
 		},
 	}
--- a/src/client/app/common/views/pages/page-editor/els/page-editor.el.section.vue
+++ b/src/client/app/common/views/pages/page-editor/els/page-editor.el.section.vue
@ -18,7 +18,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { faPlus, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../../../../../i18n';
@ -88,7 +88,7 @@ export default Vue.extend({
 			});
 			if (canceled) return;

-			const id = uuid.v4();
+			const id = uuid();
 			this.value.children.push({ id, type });
 		},
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rinsuki	b34ae35803	developブランチマージ	2019-10-19 04:43:08 +09:00
rinsuki	7555c4778a	fix doc	2019-07-19 00:50:54 +09:00
rinsuki	1a7e184be5	update dockerfile	2019-07-19 00:49:06 +09:00
rinsuki	275b7c1bf4	fix	2019-07-19 00:41:10 +09:00
rinsuki	c34197bd5b	update	2019-07-19 00:36:07 +09:00
rinsuki	471c3b6790	dependenciesのうち、いくつかのパッケージをdevDependenciesに移行	2019-07-18 20:37:17 +09:00