10.78.0

* fix type

* expose Question

* Note refs Question

* rename

* wip

* リモート投票の場合リプライ送信

* voteの実装をservicesに移動

* 投票受信

* debug

* つくる

* Revert "つくる"

This reverts commit 0c92458866.

* APIの実装はもどし

* Send Update

* AP type

* Recv Update

* Revert "Recv Update"

This reverts commit ffda39c093.

* Revert "AP type"

This reverts commit 63d8bbe29d.

* Revert "Send Update"

This reverts commit 171b046de5.

* リモートで投票を見る

* 投票はDM

* Provides choices as text for AP

* 絵文字

* fix error

* revert

* APからには不要な処理を削除

* Revert "APからには不要な処理を削除"

This reverts commit 8b5d8af9b0.

* てぬき

* めんどい

* ちっ

* remove unused code

.autogen/check_pr.jq

@@ -0,0 +1,3 @@
+.[]
+.head
+.label

.autogen/next_url.jq

@@ -0,0 +1,2 @@
+.links
+.next

.autogen/patreon.jq

@@ -0,0 +1,39 @@
+(
+  .data |
+  map(
+    select(
+      .relationships
+      .currently_entitled_tiers
+      .data[]
+    )
+  ) |
+  map(
+    .relationships
+    .user
+    .data
+    .id
+  )
+) as $data |
+.included |
+map(
+  select(
+    .id as $id |
+    $data |
+    contains(
+      [
+        $id
+      ]
+    )
+  )
+) |
+map(
+  .attributes |
+  [
+    .full_name,
+    .thumb_url,
+    .url
+  ] |
+  @tsv
+) |
+.[] |
+@text

.autogen/update_readme_patreon.sh

@@ -5,7 +5,7 @@
 # __MISSKEY_HEAD=acid-chicken:patch-autogen
 # __MISSKEY_REPO=syuilo/misskey
 # __MISSKEY_BRANCH=develop
-test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r '.[].head.label' | grep $__MISSKEY_HEAD)" && exit 1
+test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r -f check_pr.jq | grep $__MISSKEY_HEAD)" && exit 1
 cd "$(dirname $0)/.." && \
 touch null.cache && \
 rm *.cache && \
@@ -30,12 +30,12 @@ while :
   touch patreon.cache && \
   rm patreon.cache && \
   cat patreon.raw.cache | \
-  jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|map(select(.id as$id|$data|contains([$id])))|map(.attributes|[.full_name,.thumb_url,.url]|@tsv)|.[]|@text' >> patreon.cache && \
+  jq -r -f patreon.jq >> patreon.cache && \
   echo '<table><tr>' >> patreon.md.cache && \
   cat patreon.cache | \
   awk -F'\t' '{print $2,$1}' | \
   sed -e 's/ /\\" alt=\\"/' | \
-  xargs -I% echo '<td><img src="%"></td>' >> patreon.md.cache && \
+  xargs -I% echo '<td><img src="%" width="100"></td>' >> patreon.md.cache && \
   echo '</tr><tr>' >> patreon.md.cache && \
   cat patreon.cache | \
   awk -F'\t' '{print $3,$1}' | \
@@ -43,7 +43,7 @@ while :
   xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
   echo '</tr></table>' >> patreon.md.cache || \
   exit 1
-  new_url="$(cat patreon.raw.cache | jq -r '.links.next')"
+  new_url="$(cat patreon.raw.cache | jq -r -f next_url.jq)"
   test "$new_url" = 'null' && \
   break || \
   URL="$url"

.circleci/config.yml

@@ -1,11 +1,5 @@
 version: 2.1
 
-general:
-  branches:
-    ignore:
-      - l10n_develop
-      - imgbot
-
 executors:
   default:
     working_directory: /tmp/workspace
@@ -17,8 +11,20 @@ executors:
     working_directory: /tmp/workspace
     docker:
       - image: docker:latest
+  alpine:
+    working_directory: /tmp/workspace
+    docker:
+      - image: alpine:latest
 
 jobs:
+  ok:
+    executor: alpine
+    steps:
+      - run:
+          name: OK
+          command: |
+            echo -e '\033[0;32mOK\033[0;39m'
+
   build:
     executor: default
     steps:
@@ -48,6 +54,8 @@ jobs:
       - run:
           name: Build
           command: |
+            node-gyp configure
+            node-gyp build
             npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build)
             ls -1ARl node_modules > ls
       - save_cache:
@@ -82,7 +90,7 @@ jobs:
       - run:
           name: Test
           command: |
-            npm run test || (npm rebuild && npm run test) || ((node-gyp configure && node-gyp build && npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build)) && npm run test)
+            npm run test
             ls -1ARl node_modules > ls
       - save_cache:
           name: Cache npm packages
@@ -111,6 +119,8 @@ jobs:
                 command: |
                   if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
                    then
+                    apk update && apk add jq
+                    docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
                     docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
                     docker push misskey/misskey
                    else
@@ -121,10 +131,27 @@ workflows:
   version: 2
   build-and-test:
     jobs:
-      - build
+      - ok:
+          filters:
+            branches:
+              only:
+                - l10n_develop
+                - imgbot
+      - build:
+          filters:
+            branches:
+              ignore:
+                - l10n_develop
+                - imgbot
       - test:
           requires:
             - build
+          filters:
+            branches:
+              ignore:
+#                - master
+                - l10n_develop
+                - imgbot
       - test:
           without_redis: "true"
           requires:

.config/example.yml

@@ -108,22 +108,5 @@ autoAdmin: true
 #  port: 9200
 #  pass: null
 
-# ServiceWorker
-#sw:
-#  # Public key of VAPID
-#  public_key: example-sw-public-key
-#
-#  # Private key of VAPID
-#  private_key: example-sw-private-key
-
 # Clustering
 #clusterLimit: 1
-
-# Summaly proxy
-#summalyProxy: "http://example.com"
-
-# User recommendation
-#user_recommendation:
-#  external: true
-#  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
-#  timeout: 300000

.eslintrc

@@ -15,6 +15,9 @@
 		"vue/attributes-order": false,
 		"vue/require-prop-types": false,
 		"vue/require-default-prop": false,
+		"vue/html-closing-bracket-spacing": false,
+		"vue/singleline-html-element-content-newline": false,
+		"vue/no-v-html": false,
 		"no-console": 0,
 		"no-unused-vars": 0,
 		"no-empty": 0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+# Summary
+
+<!--
+  -
+  - * Please describe your changes here *
+  -
+  - If you are going to resolve some issue, please add this context.
+  - Resolve #ISSUE_NUMBER
+  -
+  - If you are going to fix some bug issue, please add this context.
+  - Fix #ISSUE_NUMBER
+  -
+  -->

.gitignore

@@ -17,3 +17,5 @@ api-docs.json
 /mongo
 /elasticsearch
 *.code-workspace
+yarn.lock
+.DS_Store

.node-version

@@ -0,0 +1 @@
+v11.7.0

CHANGELOG.md

@@ -1,9 +1,203 @@
 ChangeLog
 =========
 
-破壊的変更のみ記載。
+10.78.0
+----------
+* 他のインスタンスからアンケートに投票できるように
+* スパムアカウントを報告できるように
+* アクティブユーザー数のチャートを追加
+* 管理画面でドライブのファイルをURLやIDから操作できるように
+* リアクション解除を他のサーバーと送受信するように
+* ログイン時に二段階認証が分かりにくいのを改善
+* 投稿のツールチップを出すのは時間の上だけに変更
+* `*`や`_`でもイタリック構文を使えるように(アルファベットのみ)
+* `__`でも太字構文を使えるように(アルファベットのみ)
+* ハッシュタグ判定の強化
+* ストーク機能の廃止
+* ソーシャルタイムラインにフォロワー限定投稿が含まれていない問題を修正
+* リストタイムラインでフォロワー限定投稿が含まれていない問題を修正
+* リストタイムラインに自分宛てでないダイレクト投稿が非公開扱いで表示される問題を修正
+* 自分宛てのダイレクト投稿がホーム/ソーシャルタイムラインにストリームで流れない問題を修正
+* ストリームで投稿が流れてきたとき、返信先が「この投稿は非公開です」となる問題を修正
+* 関係のない返信がタイムラインに流れる問題を修正
+* 常にメディアを閲覧注意として投稿するオプションが機能していなかった問題を修正
+* リモートユーザーのアイコンが消えることがある問題を修正
+* ドライブのファイルメニューからアバターやバナーに設定することができない問題を修正
+* クライアントのAPIリクエストをストリーム経由で行うオプションを廃止
+* 一部箇所でカスタム絵文字が適用されていないのを修正
 
-This document describes breaking changes only.
+10.77.0
+----------
+* ローカルタイムライン無効オプションをグローバルタイムライン無効オプションと分離
+* モデレータはLTL無効時でもUIからLTLを消さない
+* インスタンス情報ページに各種タイムラインの有効/無効を表示
+
+10.76.0
+----------
+* disableLocalTimeline機能を強化
+* インスタンス情報ページの強化
+* ハッシュタグ判定の強化
+* SVGサムネイルを表示するように
+* CWの引き継ぎ機能を無効化
+
+10.75.0
+----------
+* ダイレクトを非公開のように使えるように
+* モデレーターを凍結できないように
+* モデレーター登録を解除できるように
+* NSFWなメディアをユーザーページなどで表示しないように
+* 管理画面でユーザーを状態でフィルタできるように
+* 管理者がサインイン履歴を参照できるツール
+* Renote数を再度表示するように
+* インスタンス情報ページの追加
+* テーマの調整
+* UIの改善
+
+10.74.0
+----------
+* Pleromaとのフェデレーションを修正
+* インスタンスのキャラクター画像を設定できるように
+* Catモードの朝鮮語対応
+* CWが付いた投稿に返信する際、そのCWを引き継ぐように
+* 投稿のソースをクリップボードにコピーできるように
+* i/notifications API で取得する通知の種別を配列で指定できるように
+* パフォーマンスの改善
+* バグ修正
+
+10.73.0
+-------
+* テーマの強化
+* line thiknessの設定はデバイスに保存するように
+
+10.72.0
+-------
+* いくつかのテーマの追加
+* デザインの調整
+* バグ修正
+* など
+
+10.71.0
+-------
+* いくつかのテーマの追加
+
+10.70.1
+-------
+* notes/mentions にミュートを適用するように
+* Add id to return of users/relation
+* デザインの調整
+
+10.70.0
+-------
+* フォローしているユーザーからのフォローを自動承認するオプション
+* 「非公開」の公開範囲を廃止
+* Renote数の表示を廃止
+* 投稿のフィルタリングを強化
+* デザインの調整
+
+10.69.0
+-------
+* 通知の管理を強化
+* ユーザビリティの強化
+* デザインの調整
+
+10.68.0
+-------
+* 特定ユーザーにメンション付きで新規投稿ができるボタンを追加
+* 自分の投稿にリアクションできないように
+* 数式に文法エラーがあるとき、数式のソースをそのまま表示するように
+* CWボタンにアンケートの有無を表記するように
+* デスクトップ版で設定を新しいタブで開くように
+* モバイル版で検索ができない問題を修正
+* i18nの修正
+
+10.67.0
+-------
+* トークのメッセージを削除できるように
+* リアクションを取り消せるように
+* Misskey以外のソフトウェアからの「Like」アクティビティをプリンではなく「いいね」として扱うように
+* i18nの修正
+* バグ修正
+* など
+
+10.66.2
+-------
+* i18nの修正
+* ドライブのファイル一覧取得APIでファイルサイズによるソートが機能していなかった問題を修正
+* リモートユーザーの更新時に、各ピン留め投稿の取得失敗は無視するように
+* リモートMisskeyユーザーの情報が登録/更新出来なくなっていたのを修正
+* メンションのリンク先URLに余計な@がプリフィクスされていたのを修正
+* ダイレクトでリプライする際、リプライ先のユーザーは自動的に公開先として追加するように
+* ダイレクトでメンションでもユーザーを指定できるように
+
+10.66.1
+-------
+* ActivityPubのsharedInboxに関して修正
+* MFMでのカッコの判定を改善
+* バグ修正
+
+10.66.0
+-------
+* ユーザーごとのRSSフィードを提供するように
+* リストのユーザーがすべて表示できない問題を修正
+* デザインの調整
+* パフォーマンスの改善
+
+10.65.0
+-------
+* 検索で投稿やユーザーのURLを入力した際にそれをフェッチして表示するように
+* リストのリネームと削除をできるように
+* リストからユーザーを削除できるように
+* リモートの絵文字を更新するように
+* ActivityPubのための絵文字エンドポイントを実装
+* 管理者がドライブのファイルのNSFWを設定できるように
+* ServiceWorkerの設定を管理者ページで行えるように
+* メンションの判定を改善
+* リモートの投稿を引用した際にオリジナルのURLを挿入するように
+* クライアントのパフォーマンス改善
+* CWの内容がタブタイトルに表示されるのを修正
+* アカウントを作成したときにログイン状態にならない問題を修正
+* 時計の針にテーマカラーが適用されていなかったのを修正
+* 一部の日時の表示が日本語で表示されていたのを修正
+* プロフィールの写真欄に画像以外のファイルが含まれる問題を修正
+* メンションが含まれる投稿に返信する際、フォームに予めそれらのメンションがセットされた状態にならない問題を修正
+* デッキのTLにUIの動きを減らすオプションが適用されていなかったのを修正
+* ログイン画面のタイムラインに隠した投稿が表示される問題を修正
+* サジェストが複数開いてしまう問題を修正
+* APから来たタグに登録時の長さ制限が適用されていなかったのを修正
+
+10.64.2
+-------
+* UIの動きを減らすオプションが一部のアニメーションに適用されなかったのを修正
+
+10.64.1
+-------
+* レートリミットの調整
+* アニメーションの調整
+
+10.64.0
+-------
+* いくつかのアニメーションを追加
+* OGP向けにインスタンスのバナー画像を提供するように
+* 管理者ページでドライブのファイルを表示できるように
+* ユーザビリティの強化
+* バグ修正
+
+10.63.1
+-------
+* メンションの表示を改善
+* バグ修正
+
+10.63.0
+-------
+* ActivityPubのユーザーフィールドをユーザーページに表示
+* 404ページの実装
+* パフォーマンスの向上
+* バグ修正
+
+10.62.2
+-------
+* バグ修正
+* ユーザビリティの向上
 
 10.0.0
 ------

CONTRIBUTING.md

@@ -6,14 +6,14 @@ Feature suggestions and bug reports are filed in https://github.com/syuilo/missk
 Before creating a new issue, please search existing issues to avoid duplication.
 If you find the existing issue, please add your reaction or comment to the issue.
 
-## Internationalization (i18n)
-Please see [Translation guide](./docs/translate.en.md).
-
 ## Localization (l10n)
 Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
+## Internationalization (i18n)
+Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
+
 ## Documentation
 * Documents for contributors are located in `/docs`.
 * Documents for instance admins are located in `/docs`.
@@ -25,3 +25,16 @@ Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
 ## Continuous integration
 Misskey uses CircleCI for automated test.
 Configuration files are located in `/.circleci`.
+
+## Glossary
+### AP
+Stands for _**A**ctivity**P**ub_.
+
+### MFM
+Stands for _**M**isskey **F**lavored **M**arkdown_.
+
+### Mk
+Stands for _**M**iss**k**ey_.
+
+### SW
+Stands for _**S**ervice**W**orker_.

Dockerfile

@@ -1,26 +1,27 @@
-FROM alpine:3.8 AS base
+FROM node:11-alpine AS base
 
 ENV NODE_ENV=production
 
-RUN apk add --no-cache nodejs nodejs-npm zlib
 RUN npm i -g npm@latest
 
 WORKDIR /misskey
 
 FROM base AS builder
 
+RUN unlink /usr/bin/free
 RUN apk add --no-cache \
-    gcc \
-    g++ \
-    libc-dev \
-    python \
     autoconf \
     automake \
     file \
+    g++ \
+    gcc \
+    libc-dev \
+    libtool \
     make \
     nasm \
     pkgconfig \
-    libtool \
+    procps \
+    python \
     zlib-dev
 RUN npm i -g node-gyp
 

README.md

@@ -3,16 +3,18 @@
 [![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================
 
-[![CircleCI](https://circleci.com/gh/syuilo/misskey.svg?style=svg)](https://circleci.com/gh/syuilo/misskey)
-[![][dependencies-badge]][dependencies-link]
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge)](https://circleci.com/gh/syuilo/misskey)
+[![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge)](https://david-dm.org/syuilo/misskey)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge)](http://makeapullrequest.com)
 
-**Sophisticated microblogging platform, evolving forever.**
+**A forever evolving, sophisticated microblogging platform.**
 
-[Misskey](https://misskey.xyz) is a decentralized microblogging platform born on Earth.
+<p align="justify">
+<a href="https://misskey.xyz">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? [Find instance!](https://joinmisskey.github.io/)
+Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find instance!</a>
+</p>
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
@@ -24,8 +26,8 @@ Why don't you take a short break from the hustle and bustle of the city, and div
 <img src="/assets/about/post.png" align="left" height="200px"/>
 
 <h3 align="left">Posting</h3>
-<p align="left">
-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 movies and create a poll - those are the things you can do on Misskey!
+<p align="justify">
+Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
 </p>
 
 ---
@@ -33,8 +35,8 @@ Just post your idea, hot topics and anything you want to share. You may want to
 <img src="/assets/about/reaction.png" align="right" height="200px"/>
 
 <h3 align="right">Reactions</h3>
-<p align="right">
-Easiest way to tell your emotions. Misskey allows you to add various type of reactions to other’s post. The emotional experience on Misskey will never be on other SNSs which only able to push “likes”.
+<p align="justify">
+Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
 </p>
 
 ---
@@ -42,8 +44,8 @@ Easiest way to tell your emotions. Misskey allows you to add various type of rea
 <img src="/assets/about/ui.png" align="left" height="200px"/>
 
 <h3 align="left">Interface</h3>
-<p align="left">
-Highly customizable UI for your taste. We understand no UI fits for everyone. You can edit layouts of your timeline, place selectable widgets you can easily move and create your unique home as this place will be your home.
+<p align="justify">
+Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
 </p>
 
 ---
@@ -51,80 +53,88 @@ Highly customizable UI for your taste. We understand no UI fits for everyone. Yo
 <img src="/assets/about/drive.png" align="right" width="300px"/>
 
 <h3 align="right">Misskey Drive</h3>
-<p align="right">
-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.
+<p align="justify">
+Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
 </p>
 
 ---
 
-and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz) or [other instances](https://joinmisskey.github.io/).
+...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
 
-:package: Create your own instance
+:package: Create Your Own Instance
 ----------------------------------------------------------------
-Please see [Setup and installation guide](./docs/setup.en.md).
+Please see the [Setup and Installation Guide](./docs/setup.en.md).
 
 :wrench: Contribution
 ----------------------------------------------------------------
-Please see [Contribution guide](./CONTRIBUTING.md).
+Please see the [Contribution Guide](./CONTRIBUTING.md).
 
 :heart: Backers & Sponsors
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></td>
-<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=WeuDzzz24cRXJogyIkU-mxARqkdyms-rcZKbO-GpGjw%3D" alt="weep" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=prtYqPOiSHBulhM7NU0VzMaWx39-9ntdq25b6kafDNA%3D" alt="negao" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/3?token-time=2145916800&token-hash=c8HeVqLtmdgH-gSBJg8i10gmOcwllM87MDHeznl3el0%3D" alt="Melilot" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/3?token-time=2145916800&token-hash=LtV2lRi3L2jOWMLwccr9qWYfPrFlzIo2jYZHKzHEb6k%3D" alt="Xeltica" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=Ch3iF81ZGP0LMo894Y9ajpLisgtE91SnxtZE7fxsgrM%3D" alt="べすれい" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=1FlxS9MEgmNGH_RHUVHbO5hIXB5I1z0lvA33CTvYvjA%3D" alt="gutfuckllc" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/weepjp">weep</a></td>
+<td><a href="https://www.patreon.com/user?u=12059069">naga_rus</a></td>
 <td><a href="https://www.patreon.com/negao">negao</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
+<td><a href="https://www.patreon.com/Xeltica">Xeltica</a></td>
 <td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
 <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
-<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=qsdn0-e6yLaLI6hUX9JAkyTR6a5UdnSp7T1foniBvGQ%3D" alt="YUKIMOCHI"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=0xgcpqvFDqRcV_YIEhcPNVH7gs9sLg_BBnTJXCkN4ao%3D" alt="mydarkstar" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=2PsbFNw0tnubZzgSXD01R6hIgncfiElG7H7HX2Y3dyo%3D" alt="nemu" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=9JtETp0X8gI280Ne1E8bxn6j4Lw5o2k4mJkICx97V_k%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=zrInDotuEIFslKphuSiCqr3M-r-rveTXjVKWr-VK6M0%3D" alt="Acid Chicken" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=5T8XcaAf9Zyzfg3QubR06s_kJZkArVEM2dwObrBVAU4%3D" alt="Hiratake" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=ubVARikVOg3v7NW6LDhtG-ClE1LTU3I2TJ3js2-5xDs%3D" alt="Naoki Hirayama" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
+<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</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=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</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/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?token-time=2145916800&token-hash=Ksk_2l3gjPDbnzMUOCSW1E-hdPJsNs2tSR4_RAakRK8%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=xhR1n6NAAyEb-IUXLD6_dshkFa3mefU5ZZuk1L8qKTs%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=uR-48MQ0A4j0irQSrCAQZJ-sJUSs_Fkihlg3-l59b7c%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=12531784">Takashi Shibuya</a></td>
 </tr></table>
-<table><tr>
-</tr><tr>
-</tr></table>
 
-**Last updated:** Wed, 31 Oct 2018 23:21:06 UTC
+**Last updated:** Fri, 18 Jan 2019 11:58:06 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
-> Copyright (c) 2014-2018 syuilo
+> Copyright (c) 2014-2019 syuilo
 
-Misskey is an open-source software licensed under the [GNU AGPLv3](LICENSE).
+Misskey is open-source software licensed under the [GNU AGPLv3](LICENSE).
 
 [![][agpl-3.0-badge]][AGPL-3.0]
 
 [agpl-3.0]:           https://www.gnu.org/licenses/agpl-3.0.en.html
-[agpl-3.0-badge]:     https://img.shields.io/badge/license-AGPL--3.0-444444.svg?style=flat-square
-[dependencies-link]:  https://david-dm.org/syuilo/misskey
-[dependencies-badge]: https://img.shields.io/david/syuilo/misskey.svg?style=flat-square
+[agpl-3.0-badge]:     https://img.shields.io/badge/license-AGPL--3.0-444444.svg?style=for-the-badge
 
 [backer-url]: #backers
 [backer-badge]: https://opencollective.com/misskey/backers/badge.svg

cli/reset-password.js

@@ -1,29 +0,0 @@
-const mongo = require('mongodb');
-const bcrypt = require('bcryptjs');
-const User = require('../built/models/user').default;
-
-const args = process.argv.slice(2);
-
-const user = args[0];
-
-const q = user.startsWith('@') ? {
-	username: user.split('@')[1],
-	host: user.split('@')[2] || null
-} : { _id: new mongo.ObjectID(user) };
-
-console.log(`Resetting password for ${user}...`);
-
-const passwd = 'yo';
-
-// Generate hash of password
-const hash = bcrypt.hashSync(passwd);
-
-User.update(q, {
-	$set: {
-		password: hash
-	}
-}).then(() => {
-	console.log(`Password of ${user} is now '${passwd}'`);
-}, e => {
-	console.error(e);
-});

cli/suspend.js

@@ -1,23 +0,0 @@
-const mongo = require('mongodb');
-const User = require('../built/models/user').default;
-
-const args = process.argv.slice(2);
-
-const user = args[0];
-
-const q = user.startsWith('@') ? {
-	username: user.split('@')[1],
-	host: user.split('@')[2] || null
-} : { _id: new mongo.ObjectID(user) };
-
-console.log(`Suspending ${user}...`);
-
-User.update(q, {
-	$set: {
-		isSuspended: true
-	}
-}).then(() => {
-	console.log(`Suspended ${user}`);
-}, e => {
-	console.error(e);
-});

cli/update-remote-user.js

@@ -1,12 +0,0 @@
-const updatePerson = require('../built/remote/activitypub/models/person').updatePerson;
-
-const args = process.argv.slice(2);
-const user = args[0];
-
-console.log(`Updating ${user}...`);
-
-updatePerson(user).then(() => {
-	console.log(`Updated ${user}`);
-}, e => {
-	console.error(e);
-});

docs/backup.fr.md

@@ -0,0 +1,22 @@
+Comment faire une sauvegarde de votre Misskey ?
+==========================
+
+Assurez-vous d'avoir installé **mongodb-tools**.
+
+---
+
+Dans votre terminal :
+``` shell
+$ mongodump --archive=db-backup -u <VotreNomdUtilisateur> -p <VotreMotDePasse>
+```
+
+Pour plus de détails, merci de consulter [la documentation de mongodump](https://docs.mongodb.com/manual/reference/program/mongodump/).
+
+Restauration
+-------
+
+``` shell
+$ mongorestore --archive=db-backup
+```
+
+Pour plus de détails, merci de consulter [la documentation de mongorestore](https://docs.mongodb.com/manual/reference/program/mongorestore/).

docs/backup.md

@@ -10,7 +10,7 @@ In your shell:
 $ mongodump --archive=db-backup -u <YourUserName> -p <YourPassword>
 ```
 
-For details, plese see [mongodump docs](https://docs.mongodb.com/manual/reference/program/mongodump/).
+For details, please see [mongodump docs](https://docs.mongodb.com/manual/reference/program/mongodump/).
 
 Restore
 -------

docs/docker.en.md

@@ -13,11 +13,11 @@ This guide describes how to install and setup Misskey with Docker.
 2. `cd misskey` Move to misskey directory.
 3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
 
-*2.* Make configuration files
+*2.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
-2. Edit `default.yml` and `mongo_initdb.js`.
+3. Edit `default.yml` and `mongo_initdb.js`.
 
 *3.* Configure Docker
 ----------------------------------------------------------------
@@ -31,12 +31,12 @@ Build misskey with the following:
 
 *5.* That is it.
 ----------------------------------------------------------------
-Well done! Now, you have an environment that run to Misskey.
+Well done! Now you have an environment to run Misskey.
 
 ### Launch normally
 Just `docker-compose up -d`. GLHF!
 
-### Way to Update to latest version of your Misskey
+### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git stash`
 3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
@@ -45,9 +45,9 @@ Just `docker-compose up -d`. GLHF!
 6. Check [ChangeLog](../CHANGELOG.md) for migration information
 7. `docker-compose stop && docker-compose up -d`
 
-### Way to execute cli command:
+### How to execute [cli commands](manage.en.md):
 `docker-compose run --rm web node cli/mark-admin @example`
 
 ----------------------------------------------------------------
 
-If you have any questions or troubles, feel free to contact us!
+If you have any questions or trouble, feel free to contact us!

docs/docker.fr.md

@@ -0,0 +1,67 @@
+Guide Docker
+================================================================
+
+Ce guide explique comment installer et configurer Misskey avec Docker.
+
+[Version japonaise également disponible - Japanese version also available - 日本語版もあります](./docker.ja.md)  
+[Version anglaise également disponible - English version also available - 英語版もあります](./docker.en.md)
+
+----------------------------------------------------------------
+
+*1.* Télécharger Misskey
+----------------------------------------------------------------
+1. `git clone -b master git://github.com/syuilo/misskey.git` Clone le dépôt de Misskey sur la branche master.
+2. `cd misskey` Naviguez dans le dossier du dépôt.
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+
+*2.* Configuration de Misskey
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le `default.yml`.
+2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copie le fichier `.config/mongo_initdb_example.js` et le renomme en `mongo_initdb.js`.
+3. Editez `default.yml` et `mongo_initdb.js`.
+
+*3.* Configurer Docker
+----------------------------------------------------------------
+Editez `docker-compose.yml`.
+
+*4.* Contruire Misskey
+----------------------------------------------------------------
+Contruire l'image Docker avec:
+
+`docker-compose build`
+
+*5.* C'est tout !
+----------------------------------------------------------------
+Parfait, Vous avez un environnement prêt pour démarrer Misskey.
+
+### Lancer normalement
+Utilisez la commande `docker-compose up -d`. GLHF!
+
+### How to update your Misskey server to the latest version
+1. `git fetch`
+2. `git stash`
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+4. `git stash pop`
+5. `docker-compose build`
+6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration
+7. `docker-compose stop && docker-compose up -d`
+
+### Comment exécuter des [commandes](manage.fr.md)
+`docker-compose run --rm web node cli/mark-admin @example`
+
+### Configuration d'ElasticSearch (pour la fonction de recherche)
+*1.* Préparation de l'environnement
+----------------------------------------------------------------
+1. `mkdir elasticsearch && chown 1000:1000 elasticsearch` Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
+2. `sysctl -w vm.max_map_count=262144` Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES)
+
+*2.* Après lancement du docker-compose, initialisation de la base ElasticSearch
+----------------------------------------------------------------
+1. `docker-compose -it web /bin/sh` Connexion dans le conteneur web
+2. `apk add curl` Ajout du paquet curl
+3. `curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'` Création de la base ES
+4. `exit`
+
+----------------------------------------------------------------
+
+Si vous avez des questions ou des problèmes, n'hésitez pas à nous contacter !

docs/examples/misskey.nginx

@@ -0,0 +1,70 @@
+# 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/
+#    or copy to /etc/nginx/conf.d/
+
+# For WebSocket
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache1:16m max_size=1g inactive=720m use_temp_path=off;
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name example.tld;
+
+    # For SSL domain validation
+    root /var/www/html;
+    location /.well-known/acme-challenge/ { allow all; }
+    location /.well-known/pki-validation/ { allow all; }
+    location / { return 301 https://$server_name$request_uri; }
+}
+
+server {
+    listen 443 http2;
+    listen [::]:443 http2;
+    server_name example.tld;
+    ssl on;
+		ssl_session_cache shared:ssl_session_cache:10m;
+
+    # To use Let's Encrypt certificate
+    ssl_certificate     /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem;
+
+    # To use Debian/Ubuntu's self-signed certificate (For testing or before issuing a certificate)
+    #ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+    #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+
+    # SSL protocol settings
+    ssl_protocols TLSv1 TLSv1.2;
+    ssl_ciphers ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES128-SHA;
+    ssl_prefer_server_ciphers on;
+
+    # Change to your upload limit
+    client_max_body_size 80m;
+
+    # Proxy to Node
+    location / {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_http_version 1.1;
+        proxy_redirect off;
+
+        # For WebSocket
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+
+        # Cache settings
+        proxy_cache cache1;
+        proxy_cache_lock on;
+        proxy_cache_use_stale updating;
+        add_header X-Cache $upstream_cache_status;
+    }
+}

docs/manage.en.md

@@ -8,28 +8,11 @@ coming soon
 node cli/mark-admin (User-ID or Username)
 ```
 
-## Mark as 'verified' user
-``` shell
-node cli/mark-verified (User-ID or Username)
-```
-
-## Suspend users
-``` shell
-node cli/suspend (User-ID or Username)
-```
 e.g.
 ``` shell
-# Use id
-node cli/suspend 57d01a501fdf2d07be417afe
+# By id
+node cli/mark-admin 57d01a501fdf2d07be417afe
 
-# Use username
+# By username
 node cli/suspend @syuilo
-
-# Use username (remote)
-node cli/suspend @syuilo@misskey.xyz
-```
-
-## Reset password
-``` shell
-node cli/reset-password (User-ID or Username)
 ```

docs/manage.fr.md

@@ -0,0 +1,18 @@
+# Guide d'administration
+
+## Vérifier le status de la file d'attente des taches
+coming soon
+
+## Marquer un utilisateur en tant que 'admin'
+``` shell
+node cli/mark-admin (ID utilisateur ou nom d'utilisateur)
+```
+
+Exemple :
+``` shell
+# Par id
+node cli/mark-admin 57d01a501fdf2d07be417afe
+
+# Par nom d'utilisateur
+node cli/suspend @syuilo
+```

docs/manage.ja.md

@@ -8,28 +8,11 @@ coming soon
 node cli/mark-admin (ユーザーID または ユーザー名)
 ```
 
-## 'verified'ユーザーを設定する
-``` shell
-node cli/mark-verified (ユーザーID または ユーザー名)
-```
-
-## ユーザーを凍結する
-``` shell
-node cli/suspend (ユーザーID または ユーザー名)
-```
 例:
 ``` shell
 # ユーザーID
-node cli/suspend 57d01a501fdf2d07be417afe
+node cli/mark-admin 57d01a501fdf2d07be417afe
 
 # ユーザー名
-node cli/suspend @syuilo
-
-# ユーザー名 (リモート)
-node cli/suspend @syuilo@misskey.xyz
-```
-
-## ユーザーのパスワードをリセットする
-``` shell
-node cli/reset-password (ユーザーID または ユーザー名)
+node cli/mark-admin @syuilo
 ```

docs/setup.en.md

@@ -10,7 +10,7 @@ This guide describes how to install and setup Misskey.
 
 *1.* Create Misskey user
 ----------------------------------------------------------------
-Running misskey on root is not a good idea so we create a user for that.
+Running misskey as root is not a good idea so we create a user for that.
 In debian for exemple :
 
 ```
@@ -32,7 +32,7 @@ Please install and setup these softwares:
 
 *3.* Setup MongoDB
 ----------------------------------------------------------------
-In root :
+As root:
 1. `mongo` Go to the mongo shell
 2. `use misskey` Use the misskey database
 3. `db.users.save( {dummy:"dummy"} )` Write dummy data to initialize the db.
@@ -47,17 +47,7 @@ In root :
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Install misskey dependencies.
 
-*(optional)* Generating VAPID keys
-----------------------------------------------------------------
-If you want to enable ServiceWorker, you need to generate VAPID keys:
-Unless you have set your global node_modules location elsewhere, you need to run this in root.
-
-``` shell
-npm install web-push -g
-web-push generate-vapid-keys
-```
-
-*5.* Make configuration file
+*5.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. Edit `default.yml`
@@ -69,7 +59,7 @@ Build misskey with the following:
 
 `npm run build`
 
-If you're on Debian, you will need to install the `build-essential` package.
+If you're on Debian, you will need to install the `build-essential`, `python` package.
 
 If you're still encountering errors about some modules, use node-gyp:
 
@@ -114,12 +104,14 @@ WantedBy=multi-user.target
 
 You can check if the service is running with `systemctl status misskey`.
 
-### Way to Update to latest version of your Misskey
+### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `npm run build`
 5. Check [ChangeLog](../CHANGELOG.md) for migration information
+6. Restart your Misskey process to apply changes
+7. Enjoy
 
 ----------------------------------------------------------------
 

docs/setup.fr.md

@@ -0,0 +1,116 @@
+Guide d'installation et de configuration de Misskey
+================================================================
+
+Nous vous remerçions de l'intrêt que vous manifestez pour l'installation de votre propre instance Misskey !
+Ce guide décrit les étapes à suivre afin d'installer et de configurer une instance Misskey.
+
+[La version en japonnais est également disponible sur - 日本語版もあります](./setup.ja.md)
+
+----------------------------------------------------------------
+
+*1.* Création de l'utilisateur Misskey
+----------------------------------------------------------------
+Executer misskey en tant que super-utilisateur étant une mauvaise idée, nous allons créer un utilisateur dédié.
+Sous Debian, par exemple :
+
+```
+adduser --disabled-password --disabled-login misskey
+```
+
+*2.* Installation des dépendances
+----------------------------------------------------------------
+Installez les paquets suivants :
+
+#### Dépendences :package:
+* **[Node.js](https://nodejs.org/en/)** >= 10.0.0
+* **[MongoDB](https://www.mongodb.com/)** >= 3.6
+
+##### Optionnels
+* [Redis](https://redis.io/)
+  * Redis est optionnel mais nous vous recommandons vivement de l'installer
+* [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+
+*3.* Paramètrage de MongoDB
+----------------------------------------------------------------
+En root :
+1. `mongo` Ouvrez le shell mongo
+2. `use misskey` Utilisez la base de données misskey
+3. `db.users.save( {dummy:"dummy"} )` Écrivez une donnée factice pour initialiser la base de données.
+4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
+5. `exit` Vous avez terminé !
+
+*4.* Installation de Misskey
+----------------------------------------------------------------
+1. `su - misskey` Basculez vers l'utilisateur misskey.
+2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
+3. `cd misskey` Accédez au dossier misskey.
+4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+5. `npm install` Installez les dépendances de misskey.
+
+*5.* Création du fichier de configuration
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
+2. Editez le fichier `default.yml`
+
+*6.* Construction de Misskey
+----------------------------------------------------------------
+
+Construisez Misskey comme ceci :
+
+`npm run build`
+
+Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.
+
+Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
+
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `npm run build`
+
+*7.* C'est tout.
+----------------------------------------------------------------
+Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
+
+### Lancement conventionnel
+Lancez tout simplement `npm start`. Bonne chance et amusez-vous bien !
+
+### Démarrage avec systemd
+
+1. Créez un service systemd sur : `/etc/systemd/system/misskey.service`
+2. Editez-le puis copiez et coller ceci dans le fichier :
+
+```
+[Unit]
+Description=Misskey daemon
+
+[Service]
+Type=simple
+User=misskey
+ExecStart=/usr/bin/npm start
+WorkingDirectory=/home/misskey/misskey
+TimeoutSec=60
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=misskey
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+3. `systemctl daemon-reload ; systemctl enable misskey` Redémarre systemd et active le service misskey.
+4. `systemctl start misskey` Démarre le service misskey.
+
+Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`.
+
+### Méthode de mise à jour vers la plus récente version de Misskey
+1. `git fetch`
+2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+3. `npm install`
+4. `npm run build`
+5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
+
+----------------------------------------------------------------
+
+Si vous rencontrez des difficultés ou avez d'autres questions, n'hésitez pas à nous contacter !

docs/setup.ja.md

@@ -53,15 +53,6 @@ adduser --disabled-password --disabled-login misskey
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
 5. `npm install` Misskeyの依存パッケージをインストール
 
-*(オプション)* VAPIDキーペアの生成
-----------------------------------------------------------------
-ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります:
-
-``` shell
-npm install web-push -g
-web-push generate-vapid-keys
-```
-
 *5.* 設定ファイルを作成する
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。

docs/translate.en.md

@@ -1,27 +0,0 @@
-Misskey's Translation
-=====================
-
-If you find an untranslated part on Misskey:
---------------------------------------------
-
-1. Look for untranslated parts in the misskey's source code.
-	- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.
-
-2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.
-	- In fact, `foo` should be a word that is appropriate for the situation and is easy to understand in English.
-	- For example, if the untranslated portion is the following "タイムライン" you must write: `%i18n:@timeline%`.
-
-3. Open the `locales/ja-JP.yml`, check whether the <strong>file name (path)</strong> found in step 1 exists, if not, create it.
-	- Do not put the beginning of the path `src/client/app/` in the locale file.
-	- For example, in this case we want to modify untranslated parts of `src/client/app/mobile/views/pages/home.vue`, so the key is `mobile/views/pages/home.vue`.
-
-4. Add the text property using the `foo` keyword below the path that you found or created in step 2. Make sure to type your text in quotation marks. Text should always be inside of quotes.
-	-   For example, in this case we add timeline: `timeline: "タイムライン"` to `locales/ja-JP.yml`.
-
-5. When you add text to the ja-JP file (of syuilo/misskey), it will automatically be applied to all other local language files within 24-48 hours. Translations added in ja-JP file should contain the original Japanese strings (example see step 4). 
-
-6. The new strings will automatically appear in the localized language files in the original Japanese text. After that, please go to [CrowdIn](https://crowdin.com/project/misskey) to do the localized translations in your language.
-
-7. And done！
-
-For more details, please refer to this [commit](https://github.com/syuilo/misskey/commit/10f6d5980fa7692ccb45fbc5f843458b69b7607c).

docs/translate.fr.md

@@ -1,23 +0,0 @@
-Traduction de Misskey
-=====================
-
-Si vous trouvez un segment non-traduit sur Misskey :
-----------------------------------------------------
-
-1. Veuillez chercher des parties non-traduites dans le code source de Misskey.
-	- Par exemple, supposons que vous trouviez un segment non-traduit dans : `src/client/app/mobile/views/pages/home.vue`.
-
-2. Remplacez la portion non-traduite par une chaîne de caractères de type `%i18n:@foo%`.
-	- En fait, `foo` doit être un mot approprié à la situation et facile à comprendre en français.
-	- Par exemple, si le segment non-traduit est「タイムライン」on peut écrire : `%i18n:@timeline%`.
-
-3. Ouvrez chaque fichier linguistique dans /locales, vérifiez si le <strong>nom du fichier (chemin)</strong> trouvé dans l'étape 1 existe, sinon créez-le.
-	- Ne mettez pas le début du chemin `src/client/app/` dans les fichiers /locales.
-	- Par exemple, dans ce cas de figure, nous voulons modifier le segment non-traduit de : `src/client/app/mobile/views/pages/home.vue`donc il faut juste écrire : `mobile/views/pages/home.vue` dans les fichiers linguistiques.
-
-4. Ajoutez la propriété du texte traduit grâce à la clef `foo`, en-dessous du chemin correspondant à votre modification que vous avez trouvé ou créé dans l'étape 2. À côté, veuillez indiquer entre "guillemets" la valeur de votre traduction.
-	- Par exemple, dans ce cas de figure, nous ajoutons la propriété et la traduction `timeline: "Timeline"` à `locales/fr.yml`, mais aussi la propriété et la version originale `timeline: "タイムライン"` à `locales/ja-JP.yml`.
-
-5. Vous avez réussi à traduire une portion de misskey ！
-
-Pour plus de détails, veuillez vous référer à ce  [commit](https://github.com/syuilo/misskey/commit/10f6d5980fa7692ccb45fbc5f843458b69b7607c).

docs/translate.ja.md

@@ -1,23 +0,0 @@
-Misskeyの翻訳
-============
-
-Misskey内の未翻訳箇所を見つけたら
--------------------------------
-
-1. Misskeyのソースコード内から未翻訳箇所を探してください。
-	- 例えば`src/client/app/mobile/views/pages/home.vue`で未翻訳箇所を見つけたとします。
-
-2. 未翻訳箇所を`%i18n:@foo%`のような形式の文字列に置換してください。
-	- `foo`は実際にはその場に適したわかりやすい(英語の)名前にしてください。
-	- 例えば未翻訳箇所が「タイムライン」というテキストだった場合、`%i18n:@timeline%`のようにします。
-
-3. `locales/ja-JP.yml`を開き、1.で見つけた<strong>ファイル名(パス)</strong>のキーが存在するか確認し、無ければ作成してください。
-	- パスの`src/client/app/`は省略してください。
-	- 例えば、今回の例では`src/client/app/mobile/views/pages/home.vue`の未翻訳箇所を修正したいので、キーは`mobile/views/pages/home.vue`になります。
-
-4. そのキーの直下に2.で置換した`foo`の部分をキーとし、テキストを値とするプロパティを追加します。
-	- 例えば、今回の例で言うと`locales/ja-JP.yml`に`timeline: "タイムライン"`を追加します。
-
-5. 完了です！
-
-詳しくは、[このコミット](https://github.com/syuilo/misskey/commit/10f6d5980fa7692ccb45fbc5f843458b69b7607c)などを参考にしてください。

gulpfile.ts

@@ -5,19 +5,18 @@
 import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
+const yaml = require('gulp-yaml');
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
 const cssnano = require('gulp-cssnano');
 const stylus = require('gulp-stylus');
 import * as uglifyComposer from 'gulp-uglify/composer';
-import pug = require('gulp-pug');
 import * as rimraf from 'rimraf';
 import chalk from 'chalk';
 const imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
-import * as htmlmin from 'gulp-htmlmin';
 const uglifyes = require('uglify-es');
 
 const locales = require('./locales');
@@ -33,12 +32,11 @@ if (isDebug) {
 	console.warn(chalk.yellow.bold('         built script will not be compressed.'));
 }
 
-const constants = require('./src/const.json');
-
 gulp.task('build', [
 	'build:ts',
 	'build:copy',
 	'build:client',
+	'locales',
 	'doc'
 ]);
 
@@ -57,16 +55,7 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
-// 互換性のため
-gulp.task('build:copy:lang', () =>
-	gulp.src(['./built/client/assets/*.*-*.js'])
-		.pipe(rename(path => {
-			path.basename = path.basename.replace(/\-(.*)$/, '');
-		}))
-		.pipe(gulp.dest('./built/client/assets/'))
-);
-
-gulp.task('build:copy', ['build:copy:views', 'build:copy:lang'], () =>
+gulp.task('build:copy', ['build:copy:views'], () =>
 	gulp.src([
 		'./build/Release/crypto_key.node',
 		'./src/const.json',
@@ -116,7 +105,7 @@ gulp.task('default', ['build']);
 gulp.task('build:client', [
 	'build:ts',
 	'build:client:script',
-	'build:client:pug',
+	'build:client:styles',
 	'copy:client'
 ]);
 
@@ -155,50 +144,10 @@ gulp.task('copy:client', [
 			.pipe(gulp.dest('./built/client/assets/'))
 );
 
-gulp.task('build:client:pug', [
-	'copy:client',
-	'build:client:script',
-	'build:client:styles'
-], () =>
-		gulp.src('./src/client/app/base.pug')
-			.pipe(pug({
-				locals: {
-					themeColor: constants.themeColor
-				}
-			}))
-			.pipe(htmlmin({
-				// 真理値属性の簡略化 e.g.
-				// <input value="foo" readonly="readonly"> to
-				// <input value="foo" readonly>
-				collapseBooleanAttributes: true,
-
-				// テキストの一部かもしれない空白も削除する e.g.
-				// <div> <p>    foo </p>    </div> to
-				// <div><p>foo</p></div>
-				collapseWhitespace: true,
-
-				// タグ間の改行を保持する
-				preserveLineBreaks: true,
-
-				// (できる場合は)属性のクォーテーション削除する e.g.
-				// <p class="foo-bar" id="moo" title="blah blah">foo</p> to
-				// <p class=foo-bar id=moo title="blah blah">foo</p>
-				removeAttributeQuotes: true,
-
-				// 省略可能なタグを省略する e.g.
-				// <html><p>yo</p></html> ro
-				// <p>yo</p>
-				removeOptionalTags: true,
-
-				// 属性の値がデフォルトと同じなら省略する e.g.
-				// <input type="text"> to
-				// <input>
-				removeRedundantAttributes: true,
-
-				// CSSも圧縮する
-				minifyCSS: true
-			}))
-			.pipe(gulp.dest('./built/client/app/'))
+gulp.task('locales', () =>
+	gulp.src('./locales/*.yml')
+		.pipe(yaml({ schema: 'DEFAULT_SAFE_SCHEMA' }))
+		.pipe(gulp.dest('./built/client/assets/locales/'))
 );
 
 gulp.task('doc', () =>

locales/index.js

@@ -5,7 +5,7 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
 
-const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL'];
+const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL', 'zh-CN', 'ko-KR'];
 
 const loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
 const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.45.0",
-	"clientVersion": "1.0.11641",
+	"version": "10.78.0",
+	"clientVersion": "2.0.13640",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -20,74 +20,76 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-svg-core": "1.2.8",
-		"@fortawesome/free-brands-svg-icons": "5.5.0",
+		"@fortawesome/fontawesome-svg-core": "1.2.12",
+		"@fortawesome/free-brands-svg-icons": "5.6.3",
 		"@fortawesome/free-regular-svg-icons": "5.5.0",
-		"@fortawesome/free-solid-svg-icons": "5.5.0",
-		"@fortawesome/vue-fontawesome": "0.1.2",
-		"@koa/cors": "2.2.2",
+		"@fortawesome/free-solid-svg-icons": "5.6.3",
+		"@fortawesome/vue-fontawesome": "0.1.5",
+		"@koa/cors": "2.2.3",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
 		"@types/chai-http": "3.0.5",
-		"@types/dateformat": "1.0.1",
+		"@types/dateformat": "3.0.0",
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.28",
-		"@types/file-type": "5.2.1",
+		"@types/elasticsearch": "5.0.30",
+		"@types/file-type": "10.6.0",
 		"@types/gulp": "3.8.36",
-		"@types/gulp-htmlmin": "1.3.32",
 		"@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-root": "1.0.0",
+		"@types/is-svg": "3.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.11.2",
-		"@types/koa": "2.0.46",
-		"@types/koa-bodyparser": "5.0.1",
+		"@types/js-yaml": "3.11.4",
+		"@types/katex": "0.5.0",
+		"@types/koa": "2.0.48",
+		"@types/koa-bodyparser": "5.0.2",
 		"@types/koa-compress": "2.0.8",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.33",
+		"@types/koa-router": "7.0.35",
 		"@types/koa-send": "4.1.1",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
-		"@types/minio": "7.0.0",
+		"@types/minio": "7.0.1",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.5",
-		"@types/mongodb": "3.1.12",
+		"@types/mongodb": "3.1.18",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.12.2",
+		"@types/node": "10.12.18",
+		"@types/nodemailer": "4.6.5",
 		"@types/oauth": "0.9.1",
+		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.0",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.7",
+		"@types/redis": "2.8.10",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
 		"@types/sharp": "0.21.0",
-		"@types/showdown": "1.7.5",
-		"@types/single-line-log": "1.1.0",
+		"@types/showdown": "1.9.2",
 		"@types/speakeasy": "2.0.3",
-		"@types/systeminformation": "3.23.0",
+		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.4",
-		"@types/webpack": "4.4.17",
+		"@types/webpack": "4.4.21",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
-		"animejs": "2.2.0",
-		"apexcharts": "2.1.9",
-		"autobind-decorator": "2.1.0",
+		"animejs": "3.0.1",
+		"apexcharts": "2.5.1",
+		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
@@ -95,51 +97,54 @@
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "12.0.0",
 		"chai": "4.2.0",
-		"chai-http": "4.2.0",
-		"chalk": "2.4.1",
+		"chalk": "2.4.2",
+		"chai-http": "4.2.1",
 		"commander": "2.19.0",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.1",
+		"cssnano": "4.1.8",
 		"dateformat": "3.0.3",
 		"debug": "4.1.0",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
-		"diskusage": "0.2.5",
+		"diskusage": "1.0.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.2.0",
-		"emojilib": "2.3.0",
+		"elasticsearch": "15.3.0",
+		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.8.0",
-		"eslint-plugin-vue": "4.7.1",
+		"eslint": "5.12.0",
+		"eslint-plugin-vue": "5.1.0",
 		"eventemitter3": "3.1.0",
+		"feed": "2.0.2",
 		"file-loader": "2.0.0",
-		"file-type": "10.4.0",
+		"file-type": "10.7.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "3.9.1",
 		"gulp-cssnano": "2.1.3",
-		"gulp-htmlmin": "5.0.1",
 		"gulp-imagemin": "4.1.0",
 		"gulp-mocha": "6.0.0",
-		"gulp-pug": "4.0.1",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.4",
 		"gulp-stylus": "2.7.0",
 		"gulp-tslint": "8.1.3",
-		"gulp-typescript": "4.0.2",
+		"gulp-typescript": "5.0.0",
 		"gulp-uglify": "3.0.1",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.12.0",
+		"gulp-yaml": "2.0.2",
+		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "3.5.21",
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
+		"is-svg": "3.0.0",
 		"is-url": "1.2.4",
-		"js-yaml": "3.12.0",
-		"jsdom": "13.0.0",
+		"js-yaml": "3.12.1",
+		"jsdom": "13.1.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
-		"koa": "2.6.1",
+		"katex": "0.10.0",
+		"koa": "2.6.2",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
@@ -151,30 +156,36 @@
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
-		"loader-utils": "1.1.0",
-		"mecab-async": "0.1.2",
-		"merge-options": "1.0.1",
-		"minio": "7.0.1",
+		"langmap": "0.0.16",
+		"loader-utils": "1.2.3",
+		"lookup-dns-cache": "2.1.0",
+		"minio": "7.0.3",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.1.8",
+		"moment": "2.23.0",
+		"mongodb": "3.1.10",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.11.1",
+		"nan": "2.12.1",
 		"nested-property": "0.0.7",
+		"nodemailer": "5.0.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
+		"parsimmon": "1.12.0",
 		"portscanner": "2.2.0",
+		"postcss-loader": "3.0.0",
 		"progress-bar-webpack-plugin": "1.11.0",
+		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.3.2",
+		"randomcolor": "0.5.3",
 		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
@@ -182,56 +193,58 @@
 		"request": "2.88.0",
 		"request-promise-native": "1.0.5",
 		"request-stats": "3.0.0",
-		"rimraf": "2.6.2",
+		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass-loader": "7.1.0",
 		"seedrandom": "2.4.4",
-		"sharp": "0.21.0",
-		"showdown": "1.8.7",
+		"sharp": "0.21.1",
+		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
-		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "1.0.0",
 		"style-loader": "0.23.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "3.45.9",
+		"systeminformation": "3.52.2",
 		"syuilo-password-strength": "0.0.1",
+		"terser-webpack-plugin": "1.2.1",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
-		"ts-loader": "5.3.0",
+		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
-		"tslint": "5.10.0",
-		"typescript": "3.1.6",
-		"typescript-eslint-parser": "20.1.1",
+		"tslint": "5.12.0",
+		"tslint-sonarts": "1.8.0",
+		"typescript": "3.2.2",
+		"typescript-eslint-parser": "21.0.2",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
-		"v-animate-css": "0.0.2",
+		"v-animate-css": "0.0.3",
 		"vue": "2.5.17",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
-		"vue-cropperjs": "2.2.2",
-		"vue-js-modal": "1.3.26",
+		"vue-cropperjs": "3.0.0",
+		"vue-i18n": "8.7.0",
+		"vue-js-modal": "1.3.28",
 		"vue-loader": "15.4.2",
-		"vue-router": "3.0.1",
+		"vue-marquee-text-component": "1.1.1",
+		"vue-router": "3.0.2",
+		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.1",
-		"vue-sweetalert2": "1.5.6",
+		"vue-svg-inline-loader": "1.2.7",
 		"vue-template-compiler": "2.5.17",
-		"vuedraggable": "2.16.0",
+		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.0.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
-		"webfinger.js": "2.6.6",
-		"webpack": "4.25.1",
-		"webpack-cli": "3.1.2",
+		"webfinger.js": "2.7.0",
+		"webpack": "4.28.4",
+		"webpack-cli": "3.2.1",
 		"websocket": "1.0.28",
-		"ws": "6.1.0",
+		"ws": "6.1.2",
 		"xev": "2.0.1"
 	}
 }

src/chart/active-users.ts

@@ -0,0 +1,48 @@
+import autobind from 'autobind-decorator';
+import Chart, { Obj } from '.';
+import { IUser, isLocalUser } from '../models/user';
+
+/**
+ * アクティブユーザーに関するチャート
+ */
+type ActiveUsersLog = {
+	local: {
+		/**
+		 * アクティブユーザー数
+		 */
+		count: number;
+	};
+
+	remote: ActiveUsersLog['local'];
+};
+
+class ActiveUsersChart extends Chart<ActiveUsersLog> {
+	constructor() {
+		super('activeUsers');
+	}
+
+	@autobind
+	protected async getTemplate(init: boolean, latest?: ActiveUsersLog): Promise<ActiveUsersLog> {
+		return {
+			local: {
+				count: 0
+			},
+			remote: {
+				count: 0
+			}
+		};
+	}
+
+	@autobind
+	public async update(user: IUser) {
+		const update: Obj = {
+			count: 1
+		};
+
+		await this.incIfUnique({
+			[isLocalUser(user) ? 'local' : 'remote']: update
+		}, 'users', user._id.toHexString());
+	}
+}
+
+export default new ActiveUsersChart();

src/chart/index.ts

@@ -2,12 +2,15 @@
  * チャートエンジン
  */
 
+import * as moment from 'moment';
 const nestedProperty = require('nested-property');
 import autobind from 'autobind-decorator';
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
 import { ICollection } from 'monk';
 
+const utc = moment.utc;
+
 export type Obj = { [key: string]: any };
 
 export type Partial<T> = {
@@ -58,11 +61,12 @@ export default abstract class Chart<T> {
 
 	constructor(name: string, grouped = false) {
 		this.collection = db.get<Log<T>>(`chart.${name}`);
-		if (grouped) {
-			this.collection.createIndex({ span: -1, date: -1, group: -1 }, { unique: true });
-		} else {
-			this.collection.createIndex({ span: -1, date: -1 }, { unique: true });
-		}
+		const keys = {
+			span: -1,
+			date: -1
+		} as { [key: string]: 1 | -1; };
+		if (grouped) keys.group = -1;
+		this.collection.createIndex(keys, { unique: true });
 	}
 
 	@autobind
@@ -70,14 +74,14 @@ export default abstract class Chart<T> {
 		const query: Obj = {};
 
 		const dive = (x: Obj, path: string) => {
-			Object.entries(x).forEach(([k, v]) => {
+			for (const [k, v] of Object.entries(x)) {
 				const p = path ? `${path}.${k}` : k;
 				if (typeof v === 'number') {
 					query[p] = v;
 				} else {
 					dive(v, p);
 				}
-			});
+			}
 		};
 
 		dive(x, path);
@@ -87,12 +91,12 @@ export default abstract class Chart<T> {
 
 	@autobind
 	private getCurrentDate(): [number, number, number, number] {
-		const now = new Date();
+		const now = moment().utc();
 
-		const y = now.getFullYear();
-		const m = now.getMonth();
-		const d = now.getDate();
-		const h = now.getHours();
+		const y = now.year();
+		const m = now.month();
+		const d = now.date();
+		const h = now.hour();
 
 		return [y, m, d, h];
 	}
@@ -114,15 +118,15 @@ export default abstract class Chart<T> {
 		const [y, m, d, h] = this.getCurrentDate();
 
 		const current =
-			span == 'day' ? new Date(y, m, d) :
-			span == 'hour' ? new Date(y, m, d, h) :
+			span == 'day' ? utc([y, m, d]) :
+			span == 'hour' ? utc([y, m, d, h]) :
 			null;
 
 		// 現在(今日または今のHour)のログ
 		const currentLog = await this.collection.findOne({
 			group: group,
 			span: span,
-			date: current
+			date: current.toDate()
 		});
 
 		// ログがあればそれを返して終了
@@ -158,7 +162,7 @@ export default abstract class Chart<T> {
 			log = await this.collection.insert({
 				group: group,
 				span: span,
-				date: current,
+				date: current.toDate(),
 				data: data
 			});
 		} catch (e) {
@@ -225,8 +229,8 @@ export default abstract class Chart<T> {
 		const [y, m, d, h] = this.getCurrentDate();
 
 		const gt =
-			span == 'day' ? new Date(y, m, d - range) :
-			span == 'hour' ? new Date(y, m, d, h - range) :
+			span == 'day' ? utc([y, m, d]).subtract(range, 'days') :
+			span == 'hour' ? utc([y, m, d, h]).subtract(range, 'hours') :
 			null;
 
 		// ログ取得
@@ -234,7 +238,7 @@ export default abstract class Chart<T> {
 			group: group,
 			span: span,
 			date: {
-				$gt: gt
+				$gte: gt.toDate()
 			}
 		}, {
 			sort: {
@@ -264,22 +268,45 @@ export default abstract class Chart<T> {
 			if (recentLog) {
 				logs = [recentLog];
 			}
+
+		// 要求された範囲の最も古い箇所に位置するログが存在しなかったら
+		} else if (!utc(logs[logs.length - 1].date).isSame(gt)) {
+			// 要求された範囲の最も古い箇所時点での最も新しいログを持ってきて末尾に追加する
+			// (隙間埋めできないため)
+			const outdatedLog = await this.collection.findOne({
+				group: group,
+				span: span,
+				date: {
+					$lt: gt.toDate()
+				}
+			}, {
+				sort: {
+					date: -1
+				},
+				fields: {
+					_id: 0
+				}
+			});
+
+			if (outdatedLog) {
+				logs.push(outdatedLog);
+			}
 		}
 
 		// 整形
 		for (let i = (range - 1); i >= 0; i--) {
 			const current =
-				span == 'day' ? new Date(y, m, d - i) :
-				span == 'hour' ? new Date(y, m, d, h - i) :
+				span == 'day' ? utc([y, m, d]).subtract(i, 'days') :
+				span == 'hour' ? utc([y, m, d, h]).subtract(i, 'hours') :
 				null;
 
-			const log = logs.find(l => l.date.getTime() == current.getTime());
+			const log = logs.find(l => utc(l.date).isSame(current));
 
 			if (log) {
 				promisedChart.unshift(Promise.resolve(log.data));
 			} else {
 				// 隙間埋め
-				const latest = logs.find(l => l.date.getTime() < current.getTime());
+				const latest = logs.find(l => utc(l.date).isBefore(current));
 				promisedChart.unshift(this.getTemplate(false, latest ? latest.data : null));
 			}
 		}
@@ -289,32 +316,20 @@ export default abstract class Chart<T> {
 		const res: ArrayValue<T> = {} as any;
 
 		/**
-		 * [{
-		 * 	xxxxx: 1, yyyyy: 5
-		 * }, {
-		 * 	xxxxx: 2, yyyyy: 6
-		 * }, {
-		 * 	xxxxx: 3, yyyyy: 7
-		 * }]
-		 *
+		 * [{ foo: 1, bar: 5 }, { foo: 2, bar: 6 }, { foo: 3, bar: 7 }]
 		 * を
-		 *
-		 * {
-		 * 	xxxxx: [1, 2, 3],
-		 * 	yyyyy: [5, 6, 7]
-		 * }
-		 *
+		 * { foo: [1, 2, 3], bar: [5, 6, 7] }
 		 * にする
 		 */
 		const dive = (x: Obj, path?: string) => {
-			Object.entries(x).forEach(([k, v]) => {
+			for (const [k, v] of Object.entries(x)) {
 				const p = path ? `${path}.${k}` : k;
 				if (typeof v == 'object') {
 					dive(v, p);
 				} else {
 					nestedProperty.set(res, p, chart.map(s => nestedProperty.get(s, p)));
 				}
-			});
+			}
 		};
 
 		dive(chart[0]);

src/client/app/admin/script.ts

@@ -9,6 +9,7 @@ import './style.styl';
 
 import init from '../init';
 import Index from './views/index.vue';
+import NotFound from '../common/views/pages/not-found.vue';
 
 init(launch => {
 	document.title = 'Admin';
@@ -19,6 +20,7 @@ init(launch => {
 		base: '/admin/',
 		routes: [
 			{ path: '/', component: Index },
+			{ path: '*', component: NotFound }
 		]
 	});
 

src/client/app/admin/views/abuse.vue

@@ -0,0 +1,83 @@
+<template>
+<div>
+	<ui-card>
+		<div slot="title"><fa :icon="faExclamationCircle"/> {{ $t('title') }}</div>
+		<section class="fit-top">
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div v-for="report in userReports" :key="report.id" class="haexwsjc">
+					<ui-horizon-group inputs>
+						<ui-input :value="report.user | acct" type="text">
+							<span>{{ $t('target') }}</span>
+						</ui-input>
+						<ui-input :value="report.reporter | acct" type="text">
+							<span>{{ $t('reporter') }}</span>
+						</ui-input>
+					</ui-horizon-group>
+					<ui-textarea :value="report.comment" readonly>
+						<span>{{ $t('details') }}</span>
+					</ui-textarea>
+					<ui-button @click="removeReport(report)">{{ $t('remove-report') }}</ui-button>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMore" @click="fetchUserReports">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+
+export default Vue.extend({
+	i18n: i18n('admin/views/abuse.vue'),
+
+	data() {
+		return {
+			limit: 10,
+			untilId: undefined,
+			userReports: [],
+			existMore: false,
+			faExclamationCircle
+		};
+	},
+
+	mounted() {
+		this.fetchUserReports();
+	},
+
+	methods: {
+		fetchUserReports() {
+			this.$root.api('admin/abuse-user-reports', {
+				untilId: this.untilId,
+				limit: this.limit + 1
+			}).then(reports => {
+				if (reports.length == this.limit + 1) {
+					reports.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				this.userReports = this.userReports.concat(reports);
+				this.untilId = this.userReports[this.userReports.length - 1].id;
+			});
+		},
+
+		removeReport(report) {
+			this.$root.api('admin/remove-abuse-user-report', {
+				reportId: report.id
+			}).then(() => {
+				this.userReports = this.userReports.filter(r => r.id != report.id);
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.haexwsjc
+	padding-bottom 16px
+	border-bottom solid 1px var(--faceDivider)
+
+</style>

src/client/app/admin/views/announcements.vue

@@ -1,30 +1,32 @@
 <template>
-<div class="cdeuzmsthagexbkpofbmatmugjuvogfb">
+<div>
 	<ui-card>
-		<div slot="title"><fa icon="broadcast-tower"/> %i18n:@announcements%</div>
+		<div slot="title"><fa icon="broadcast-tower"/> {{ $t('announcements') }}</div>
 		<section v-for="(announcement, i) in announcements" class="fit-top">
 			<ui-input v-model="announcement.title" @change="save">
-				<span>%i18n:@title%</span>
+				<span>{{ $t('title') }}</span>
 			</ui-input>
 			<ui-textarea v-model="announcement.text">
-				<span>%i18n:@text%</span>
+				<span>{{ $t('text') }}</span>
 			</ui-textarea>
-			<ui-horizon-group>
-				<ui-button @click="save()"><fa :icon="['far', 'save']"/> %i18n:@save%</ui-button>
-				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> %i18n:@remove%</ui-button>
+			<ui-horizon-group class="fit-bottom">
+				<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
+				<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
 			</ui-horizon-group>
 		</section>
 		<section>
-			<ui-button @click="add"><fa icon="plus"/> %i18n:@add%</ui-button>
+			<ui-button @click="add"><fa icon="plus"/> {{ $t('add') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/announcements.vue'),
 	data() {
 		return {
 			announcements: [],
@@ -32,47 +34,47 @@ export default Vue.extend({
 	},
 
 	created() {
-		(this as any).os.getMeta().then(meta => {
+		this.$root.getMeta().then(meta => {
 			this.announcements = meta.broadcasts;
 		});
 	},
 
 	methods: {
 		add() {
-			this.announcements.push({
+			this.announcements.unshift({
 				title: '',
 				text: ''
 			});
 		},
 
 		remove(i) {
-			this.$swal({
+			this.$root.dialog({
 				type: 'warning',
-				text: '%i18n:@_remove.are-you-sure%'.replace('$1', this.announcements.find((_, j) => j == i).title),
+				text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
 				showCancelButton: true
-			}).then(res => {
-				if (!res.value) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 				this.announcements = this.announcements.filter((_, j) => j !== i);
 				this.save(true);
-				this.$swal({
+				this.$root.dialog({
 					type: 'success',
-					text: '%i18n:@_remove.removed%'
+					text: this.$t('_remove.removed')
 				});
 			});
 		},
 
 		save(silent) {
-			(this as any).api('admin/update-meta', {
+			this.$root.api('admin/update-meta', {
 				broadcasts: this.announcements
 			}).then(() => {
 				if (!silent) {
-					this.$swal({
+					this.$root.dialog({
 						type: 'success',
-						text: '%i18n:@saved%'
+						text: this.$t('saved')
 					});
 				}
 			}).catch(e => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -81,10 +83,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.cdeuzmsthagexbkpofbmatmugjuvogfb
-	@media (min-width 500px)
-		padding 16px
-
-</style>

src/client/app/admin/views/ap-log.vue

@@ -3,17 +3,17 @@
 	<table>
 		<thead>
 			<tr>
-				<th><fa icon="exchange-alt"/> In/Out</th>
+				<th><fa :icon="faExchangeAlt"/> In/Out</th>
+				<th><fa :icon="faBolt"/> Activity</th>
 				<th><fa icon="server"/> Host</th>
-				<th><fa icon="bolt"/> Activity</th>
 				<th><fa icon="user"/> Actor</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr v-for="log in logs" :key="log.id">
 				<td :class="log.direction">{{ log.direction == 'in' ? '<' : '>' }} {{ log.direction }}</td>
-				<td>{{ log.host }}</td>
 				<td>{{ log.activity }}</td>
+				<td>{{ log.host }}</td>
 				<td>@{{ log.actor }}</td>
 			</tr>
 		</tbody>
@@ -23,17 +23,19 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import { faBolt, faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	data() {
 		return {
 			logs: [],
-			connection: null
+			connection: null,
+			faBolt, faExchangeAlt
 		};
 	},
 
 	mounted() {
-		this.connection = (this as any).os.stream.useSharedConnection('apLog');
+		this.connection = this.$root.stream.useSharedConnection('apLog');
 		this.connection.on('log', this.onLog);
 		this.connection.on('logs', this.onLogs);
 		this.connection.send('requestLog', {
@@ -54,7 +56,9 @@ export default Vue.extend({
 		},
 
 		onLogs(logs) {
-			logs.reverse().forEach(log => this.onLog(log));
+			for (const log of logs.reverse()) {
+				this.onLog(log)
+			}
 		}
 	}
 });
@@ -65,7 +69,7 @@ export default Vue.extend({
 	display block
 	padding 12px 16px 16px 16px
 	height 250px
-	overflow hidden
+	overflow auto
 	box-shadow 0 2px 4px rgba(0, 0, 0, 0.1)
 	background var(--adminDashboardCardBg)
 	border-radius 8px

src/client/app/admin/views/charts.vue

@@ -1,36 +1,37 @@
 <template>
 <div class="qvgidhudpqhjttdhxubzuyrhyzgslujw">
 	<header>
-		<b><fa :icon="['far', 'chart-bar']"/> %i18n:@title%:</b>
+		<b><fa :icon="['far', 'chart-bar']"/> {{ $t('title') }}:</b>
 		<select v-model="src">
-			<optgroup label="%i18n:@federation%">
-				<option value="federation-instances">%i18n:@charts.federation-instances%</option>
-				<option value="federation-instances-total">%i18n:@charts.federation-instances-total%</option>
+			<optgroup :label="$t('federation')">
+				<option value="federation-instances">{{ $t('charts.federation-instances') }}</option>
+				<option value="federation-instances-total">{{ $t('charts.federation-instances-total') }}</option>
 			</optgroup>
-			<optgroup label="%i18n:@users%">
-				<option value="users">%i18n:@charts.users%</option>
-				<option value="users-total">%i18n:@charts.users-total%</option>
+			<optgroup :label="$t('users')">
+				<option value="users">{{ $t('charts.users') }}</option>
+				<option value="users-total">{{ $t('charts.users-total') }}</option>
+				<option value="active-users">{{ $t('charts.active-users') }}</option>
 			</optgroup>
-			<optgroup label="%i18n:@notes%">
-				<option value="notes">%i18n:@charts.notes%</option>
-				<option value="local-notes">%i18n:@charts.local-notes%</option>
-				<option value="remote-notes">%i18n:@charts.remote-notes%</option>
-				<option value="notes-total">%i18n:@charts.notes-total%</option>
+			<optgroup :label="$t('notes')">
+				<option value="notes">{{ $t('charts.notes') }}</option>
+				<option value="local-notes">{{ $t('charts.local-notes') }}</option>
+				<option value="remote-notes">{{ $t('charts.remote-notes') }}</option>
+				<option value="notes-total">{{ $t('charts.notes-total') }}</option>
 			</optgroup>
-			<optgroup label="%i18n:@drive%">
-				<option value="drive-files">%i18n:@charts.drive-files%</option>
-				<option value="drive-files-total">%i18n:@charts.drive-files-total%</option>
-				<option value="drive">%i18n:@charts.drive%</option>
-				<option value="drive-total">%i18n:@charts.drive-total%</option>
+			<optgroup :label="$t('drive')">
+				<option value="drive-files">{{ $t('charts.drive-files') }}</option>
+				<option value="drive-files-total">{{ $t('charts.drive-files-total') }}</option>
+				<option value="drive">{{ $t('charts.drive') }}</option>
+				<option value="drive-total">{{ $t('charts.drive-total') }}</option>
 			</optgroup>
-			<optgroup label="%i18n:@network%">
-				<option value="network-requests">%i18n:@charts.network-requests%</option>
-				<option value="network-time">%i18n:@charts.network-time%</option>
-				<option value="network-usage">%i18n:@charts.network-usage%</option>
+			<optgroup :label="$t('network')">
+				<option value="network-requests">{{ $t('charts.network-requests') }}</option>
+				<option value="network-time">{{ $t('charts.network-time') }}</option>
+				<option value="network-usage">{{ $t('charts.network-usage') }}</option>
 			</optgroup>
 		</select>
 		<div>
-			<span @click="span = 'day'" :class="{ active: span == 'day' }">%i18n:@per-day%</span> | <span @click="span = 'hour'" :class="{ active: span == 'hour' }">%i18n:@per-hour%</span>
+			<span @click="span = 'day'" :class="{ active: span == 'day' }">{{ $t('per-day') }}</span> | <span @click="span = 'hour'" :class="{ active: span == 'hour' }">{{ $t('per-hour') }}</span>
 		</div>
 	</header>
 	<div ref="chart"></div>
@@ -39,6 +40,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import i18n from '../../i18n';
 import * as tinycolor from 'tinycolor2';
 import * as ApexCharts from 'apexcharts';
 
@@ -48,6 +50,7 @@ const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
 const negate = arr => arr.map(x => -x);
 
 export default Vue.extend({
+	i18n: i18n('admin/views/charts.vue'),
 	data() {
 		return {
 			chart: null,
@@ -65,6 +68,7 @@ export default Vue.extend({
 				case 'federation-instances-total': return this.federationInstancesChart(true);
 				case 'users': return this.usersChart(false);
 				case 'users-total': return this.usersChart(true);
+				case 'active-users': return this.activeUsersChart();
 				case 'notes': return this.notesChart('combined');
 				case 'local-notes': return this.notesChart('local');
 				case 'remote-notes': return this.notesChart('remote');
@@ -103,33 +107,37 @@ export default Vue.extend({
 		this.now = new Date();
 
 		const [perHour, perDay] = await Promise.all([Promise.all([
-			(this as any).api('charts/federation', { limit: limit, span: 'hour' }),
-			(this as any).api('charts/users', { limit: limit, span: 'hour' }),
-			(this as any).api('charts/notes', { limit: limit, span: 'hour' }),
-			(this as any).api('charts/drive', { limit: limit, span: 'hour' }),
-			(this as any).api('charts/network', { limit: limit, span: 'hour' })
+			this.$root.api('charts/federation', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/users', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/active-users', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/notes', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/drive', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/network', { limit: limit, span: 'hour' })
 		]), Promise.all([
-			(this as any).api('charts/federation', { limit: limit, span: 'day' }),
-			(this as any).api('charts/users', { limit: limit, span: 'day' }),
-			(this as any).api('charts/notes', { limit: limit, span: 'day' }),
-			(this as any).api('charts/drive', { limit: limit, span: 'day' }),
-			(this as any).api('charts/network', { limit: limit, span: 'day' })
+			this.$root.api('charts/federation', { limit: limit, span: 'day' }),
+			this.$root.api('charts/users', { limit: limit, span: 'day' }),
+			this.$root.api('charts/active-users', { limit: limit, span: 'day' }),
+			this.$root.api('charts/notes', { limit: limit, span: 'day' }),
+			this.$root.api('charts/drive', { limit: limit, span: 'day' }),
+			this.$root.api('charts/network', { limit: limit, span: 'day' })
 		])]);
 
 		const chart = {
 			perHour: {
 				federation: perHour[0],
 				users: perHour[1],
-				notes: perHour[2],
-				drive: perHour[3],
-				network: perHour[4]
+				activeUsers: perHour[2],
+				notes: perHour[3],
+				drive: perHour[4],
+				network: perHour[5]
 			},
 			perDay: {
 				federation: perDay[0],
 				users: perDay[1],
-				notes: perDay[2],
-				drive: perDay[3],
-				network: perDay[4]
+				activeUsers: perDay[2],
+				notes: perDay[3],
+				drive: perDay[4],
+				network: perDay[5]
 			}
 		};
 
@@ -138,6 +146,10 @@ export default Vue.extend({
 		this.render();
 	},
 
+	beforeDestroy() {
+		this.chartInstance.destroy();
+	},
+
 	methods: {
 		setSrc(src) {
 			this.src = src;
@@ -177,7 +189,7 @@ export default Vue.extend({
 				},
 				legend: {
 					labels: {
-						color: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
 					},
 				},
 				xaxis: {
@@ -315,6 +327,24 @@ export default Vue.extend({
 			};
 		},
 
+		activeUsersChart(): any {
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: this.format(sum(this.stats.activeUsers.local.count, this.stats.activeUsers.remote.count))
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: this.format(this.stats.activeUsers.local.count)
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: this.format(this.stats.activeUsers.remote.count)
+				}]
+			};
+		},
+
 		driveChart(): any {
 			return {
 				bytes: true,

src/client/app/admin/views/cpu-memory.vue

@@ -47,7 +47,7 @@ export default Vue.extend({
 	},
 
 	mounted() {
-		(this as any).os.getMeta().then(meta => {
+		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
 
@@ -117,6 +117,9 @@ export default Vue.extend({
 	beforeDestroy() {
 		this.connection.off('stats', this.onStats);
 		this.connection.off('statsLog', this.onStatsLog);
+
+		this.cpuChart.destroy();
+		this.memChart.destroy();
 	},
 
 	methods: {
@@ -129,7 +132,9 @@ export default Vue.extend({
 		},
 
 		onStatsLog(statsLog) {
-			statsLog.reverse().forEach(stats => this.onStats(stats));
+			for (const stats of statsLog.reverse()) {
+				this.onStats(stats);
+			}
 		}
 	}
 });

src/client/app/admin/views/dashboard.vue

@@ -5,20 +5,26 @@
 		<p><b>Machine</b><span>{{ meta.machine }}</span></p>
 		<p><b>OS</b><span>{{ meta.os }}</span></p>
 		<p><b>Node</b><span>{{ meta.node }}</span></p>
-		<p>%i18n:common.ai-chan-kawaii%</p>
+		<p>{{ $t('@.ai-chan-kawaii') }}</p>
 	</header>
 
+	<marquee-text v-if="instances.length > 0" class="instances" :repeat="10" :duration="60">
+		<span v-for="instance in instances" class="instance">
+			<b :style="{ background: instance.bg }">{{ instance.host }}</b>{{ instance.notesCount | number }} / {{ instance.usersCount | number }}
+		</span>
+	</marquee-text>
+
 	<div v-if="stats" class="stats">
 		<div>
 			<div>
 				<div><fa icon="user"/></div>
 				<div>
-					<span>%i18n:@accounts%</span>
-					<b class="primary">{{ stats.originalUsersCount | number }}</b>
+					<span>{{ $t('accounts') }}</span>
+					<b>{{ stats.originalUsersCount | number }}</b>
 				</div>
 			</div>
 			<div>
-				<span><fa icon="home"/> %i18n:@this-instance%</span>
+				<span><fa icon="home"/> {{ $t('this-instance') }}</span>
 				<span @click="setChartSrc('users')"><fa :icon="['far', 'chart-bar']"/></span>
 			</div>
 		</div>
@@ -26,25 +32,25 @@
 			<div>
 				<div><fa icon="pencil-alt"/></div>
 				<div>
-					<span>%i18n:@notes%</span>
-					<b class="primary">{{ stats.originalNotesCount | number }}</b>
+					<span>{{ $t('notes') }}</span>
+					<b>{{ stats.originalNotesCount | number }}</b>
 				</div>
 			</div>
 			<div>
-				<span><fa icon="home"/> %i18n:@this-instance%</span>
+				<span><fa icon="home"/> {{ $t('this-instance') }}</span>
 				<span @click="setChartSrc('notes')"><fa :icon="['far', 'chart-bar']"/></span>
 			</div>
 		</div>
 		<div>
 			<div>
-				<div><fa icon="database"/></div>
+				<div><fa :icon="faDatabase"/></div>
 				<div>
-					<span>%i18n:@drive%</span>
+					<span>{{ $t('drive') }}</span>
 					<b>{{ stats.driveUsageLocal | bytes }}</b>
 				</div>
 			</div>
 			<div>
-				<span><fa icon="home"/> %i18n:@this-instance%</span>
+				<span><fa icon="home"/> {{ $t('this-instance') }}</span>
 				<span @click="setChartSrc('drive')"><fa :icon="['far', 'chart-bar']"/></span>
 			</div>
 		</div>
@@ -52,12 +58,12 @@
 			<div>
 				<div><fa :icon="['far', 'hdd']"/></div>
 				<div>
-					<span>%i18n:@instances%</span>
+					<span>{{ $t('instances') }}</span>
 					<b>{{ stats.instances | number }}</b>
 				</div>
 			</div>
 			<div>
-				<span><fa icon="globe"/> %i18n:@federated%</span>
+				<span><fa icon="globe"/> {{ $t('federated') }}</span>
 				<span @click="setChartSrc('federation-instances-total')"><fa :icon="['far', 'chart-bar']"/></span>
 			</div>
 		</div>
@@ -78,45 +84,73 @@
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
 import XCpuMemory from "./cpu-memory.vue";
 import XCharts from "./charts.vue";
 import XApLog from "./ap-log.vue";
+import { faDatabase } from '@fortawesome/free-solid-svg-icons';
+import MarqueeText from 'vue-marquee-text-component';
+import randomColor from 'randomcolor';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/dashboard.vue'),
+
 	components: {
 		XCpuMemory,
 		XCharts,
-		XApLog
+		XApLog,
+		MarqueeText
 	},
 
 	data() {
 		return {
 			stats: null,
 			connection: null,
-			meta: null
+			meta: null,
+			instances: [],
+			clock: null,
+			faDatabase
 		};
 	},
 
 	created() {
-		this.connection = (this as any).os.stream.useSharedConnection('serverStats');
+		this.connection = this.$root.stream.useSharedConnection('serverStats');
 
-		(this as any).os.getMeta().then(meta => {
+		this.updateStats();
+		this.clock = setInterval(this.updateStats, 1000);
+
+		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
 
-		(this as any).api('stats').then(stats => {
-			this.stats = stats;
+		this.$root.api('instances', {
+			sort: '+notes'
+		}).then(instances => {
+			for (const i of instances) {
+				i.bg = randomColor({
+					seed: i.host,
+					luminosity: 'dark'
+				});
+			}
+			this.instances = instances;
 		});
 	},
 
 	beforeDestroy() {
 		this.connection.dispose();
+		clearInterval(this.clock);
 	},
 
 	methods: {
 		setChartSrc(src) {
 			this.$refs.charts.setSrc(src);
+		},
+
+		updateStats() {
+			this.$root.api('stats', {}, true).then(stats => {
+				this.stats = stats;
+			});
 		}
 	}
 });
@@ -127,11 +161,10 @@ export default Vue.extend({
 	padding 16px
 
 	@media (min-width 500px)
-		padding 32px
+		padding 16px
 
 	> header
 		display flex
-		margin-bottom 16px
 		padding-bottom 16px
 		border-bottom solid 1px var(--adminDashboardHeaderBorder)
 		color var(--adminDashboardHeaderFg)
@@ -156,6 +189,20 @@ export default Vue.extend({
 				margin-left auto
 				margin-right 0
 
+	> .instances
+		padding 16px
+		color var(--adminDashboardHeaderFg)
+		font-size 13px
+
+		>>> .instance
+			margin 0 10px
+
+			> b
+				padding 2px 6px
+				margin-right 4px
+				border-radius 4px
+				color #fff
+
 	> .stats
 		display flex
 		justify-content space-between
@@ -196,9 +243,6 @@ export default Vue.extend({
 					> b
 						display block
 
-						&.primary
-							color var(--primary)
-
 			> div:last-child
 				display flex
 				padding 6px 16px

src/client/app/admin/views/drive.vue

@@ -0,0 +1,267 @@
+<template>
+<div>
+	<ui-card>
+		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
+		<section class="fit-top">
+			<ui-input v-model="target" type="text">
+				<span>{{ $t('fileid-or-url') }}</span>
+			</ui-input>
+			<ui-horizon-group>
+				<ui-button @click="findAndToggleSensitive(true)"><fa :icon="faEyeSlash"/> {{ $t('mark-as-sensitive') }}</ui-button>
+				<ui-button @click="findAndToggleSensitive(false)"><fa :icon="faEye"/> {{ $t('unmark-as-sensitive') }}</ui-button>
+			</ui-horizon-group>
+			<ui-button @click="findAndDel()"><fa :icon="faTrashAlt"/> {{ $t('delete') }}</ui-button>
+			<ui-button @click="show()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<ui-textarea v-if="file" :value="file | json5" readonly tall style="margin-top:16px;"></ui-textarea>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<div slot="title"><fa :icon="faCloud"/> {{ $t('@.drive') }}</div>
+		<section class="fit-top">
+			<ui-horizon-group inputs>
+				<ui-select v-model="sort">
+					<span slot="label">{{ $t('sort.title') }}</span>
+					<option value="-createdAt">{{ $t('sort.createdAtAsc') }}</option>
+					<option value="+createdAt">{{ $t('sort.createdAtDesc') }}</option>
+					<option value="-size">{{ $t('sort.sizeAsc') }}</option>
+					<option value="+size">{{ $t('sort.sizeDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="origin">
+					<span slot="label">{{ $t('origin.title') }}</span>
+					<option value="combined">{{ $t('origin.combined') }}</option>
+					<option value="local">{{ $t('origin.local') }}</option>
+					<option value="remote">{{ $t('origin.remote') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div class="kidvdlkg" v-for="file in files">
+					<div @click="file._open = !file._open">
+						<div>
+							<div class="thumbnail" :style="thumbnail(file)"></div>
+						</div>
+						<div>
+							<header>
+								<b>{{ file.name }}</b>
+								<span class="username">@{{ file.user | acct }}</span>
+							</header>
+							<div>
+								<div>
+									<span style="margin-right:16px;">{{ file.type }}</span>
+									<span>{{ file.datasize | bytes }}</span>
+								</div>
+								<div><mk-time :time="file.createdAt" mode="detail"/></div>
+							</div>
+						</div>
+					</div>
+					<div v-show="file._open">
+						<ui-input readonly :value="file.url"></ui-input>
+						<ui-horizon-group>
+							<ui-button @click="toggleSensitive(file)" v-if="file.isSensitive"><fa :icon="faEye"/> {{ $t('unmark-as-sensitive') }}</ui-button>
+							<ui-button @click="toggleSensitive(file)" v-else><fa :icon="faEyeSlash"/> {{ $t('mark-as-sensitive') }}</ui-button>
+							<ui-button @click="del(file)"><fa :icon="faTrashAlt"/> {{ $t('delete') }}</ui-button>
+						</ui-horizon-group>
+					</div>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMore" @click="fetch">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { faCloud, faTerminal, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { faTrashAlt, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
+
+export default Vue.extend({
+	i18n: i18n('admin/views/drive.vue'),
+
+	data() {
+		return {
+			file: null,
+			target: null,
+			sort: '+createdAt',
+			origin: 'combined',
+			limit: 10,
+			offset: 0,
+			files: [],
+			existMore: false,
+			faCloud, faTrashAlt, faEye, faEyeSlash, faTerminal, faSearch
+		};
+	},
+
+	watch: {
+		sort() {
+			this.files = [];
+			this.offset = 0;
+			this.fetch();
+		},
+
+		origin() {
+			this.files = [];
+			this.offset = 0;
+			this.fetch();
+		}
+	},
+
+	mounted() {
+		this.fetch();
+	},
+
+	methods: {
+		async fetchFile() {
+			try {
+				return await this.$root.api('drive/files/show', this.target.startsWith('http') ? { url: this.target } : { fileId: this.target });
+			} catch (e) {
+				if (e == 'file-not-found') {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('file-not-found')
+					});
+				} else {
+					this.$root.dialog({
+						type: 'error',
+						text: e.toString()
+					});
+				}
+			}
+		},
+
+		fetch() {
+			this.$root.api('admin/drive/files', {
+				origin: this.origin,
+				sort: this.sort,
+				offset: this.offset,
+				limit: this.limit + 1
+			}).then(files => {
+				if (files.length == this.limit + 1) {
+					files.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				for (const x of files) {
+					x._open = false;
+				}
+				this.files = this.files.concat(files);
+				this.offset += this.limit;
+			});
+		},
+
+		thumbnail(file: any): any {
+			return {
+				'background-color': file.properties.avgColor && file.properties.avgColor.length == 3 ? `rgb(${file.properties.avgColor.join(',')})` : 'transparent',
+				'background-image': `url(${file.thumbnailUrl})`
+			};
+		},
+
+		async del(file: any) {
+			const process = async () => {
+				await this.$root.api('drive/files/delete', { fileId: file.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('deleted')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
+
+		toggleSensitive(file: any) {
+			this.$root.api('drive/files/update', {
+				fileId: file.id,
+				isSensitive: !file.isSensitive
+			});
+
+			file.isSensitive = !file.isSensitive;
+		},
+
+		async show() {
+			const file = await this.fetchFile();
+			this.$root.api('admin/drive/show-file', { fileId: file.id }).then(info => {
+				this.file = info;
+			});
+		},
+
+		async findAndToggleSensitive(sensitive) {
+			const process = async () => {
+				const file = await this.fetchFile();
+				await this.$root.api('drive/files/update', {
+					fileId: file.id,
+					isSensitive: sensitive
+				});
+				this.$root.dialog({
+					type: 'success',
+					text: sensitive ? this.$t('marked-as-sensitive') : this.$t('unmarked-as-sensitive')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
+
+		async findAndDel() {
+			const process = async () => {
+				const file = await this.fetchFile();
+				await this.$root.api('drive/files/delete', { fileId: file.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('deleted')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kidvdlkg
+	padding 16px 0
+	border-top solid 1px var(--faceDivider)
+
+	> div:first-child
+		display flex
+		cursor pointer
+
+		> div:nth-child(1)
+			> .thumbnail
+				display block
+				width 64px
+				height 64px
+				background-size cover
+				background-position center center
+
+		> div:nth-child(2)
+			flex 1
+			padding-left 16px
+
+			@media (max-width 500px)
+				font-size 14px
+
+			> header
+				word-break break-word
+
+				> .username
+					margin-left 8px
+					opacity 0.7
+
+</style>

src/client/app/admin/views/emoji.vue

@@ -1,62 +1,70 @@
 <template>
-<div class="tumhkfkmgtvzljezfvmgkeurkfncshbe">
+<div>
 	<ui-card>
-		<div slot="title"><fa icon="plus"/> %i18n:@add-emoji.title%</div>
+		<div slot="title"><fa icon="plus"/> {{ $t('add-emoji.title') }}</div>
 		<section class="fit-top">
 			<ui-horizon-group inputs>
 				<ui-input v-model="name">
-					<span>%i18n:@add-emoji.name%</span>
-					<span slot="desc">%i18n:@add-emoji.name-desc%</span>
+					<span>{{ $t('add-emoji.name') }}</span>
+					<span slot="desc">{{ $t('add-emoji.name-desc') }}</span>
 				</ui-input>
 				<ui-input v-model="aliases">
-					<span>%i18n:@add-emoji.aliases%</span>
-					<span slot="desc">%i18n:@add-emoji.aliases-desc%</span>
+					<span>{{ $t('add-emoji.aliases') }}</span>
+					<span slot="desc">{{ $t('add-emoji.aliases-desc') }}</span>
 				</ui-input>
 			</ui-horizon-group>
 			<ui-input v-model="url">
 				<i slot="icon"><fa icon="link"/></i>
-				<span>%i18n:@add-emoji.url%</span>
+				<span>{{ $t('add-emoji.url') }}</span>
 			</ui-input>
-			<ui-info>%i18n:@add-emoji.info%</ui-info>
-			<ui-button @click="add">%i18n:@add-emoji.add%</ui-button>
+			<ui-info>{{ $t('add-emoji.info') }}</ui-info>
+			<ui-button @click="add">{{ $t('add-emoji.add') }}</ui-button>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="['far', 'grin']"/> %i18n:@emojis.title%</div>
-		<section v-for="emoji in emojis">
-			<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
-			<ui-horizon-group inputs>
-				<ui-input v-model="emoji.name">
-					<span>%i18n:@add-emoji.name%</span>
+		<div slot="title"><fa :icon="faGrin"/> {{ $t('emojis.title') }}</div>
+		<section v-for="emoji in emojis" class="oryfrbft">
+			<div>
+				<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
+			</div>
+			<div>
+				<ui-horizon-group>
+					<ui-input v-model="emoji.name">
+						<span>{{ $t('add-emoji.name') }}</span>
+					</ui-input>
+					<ui-input v-model="emoji.aliases">
+						<span>{{ $t('add-emoji.aliases') }}</span>
+					</ui-input>
+				</ui-horizon-group>
+				<ui-input v-model="emoji.url">
+					<i slot="icon"><fa icon="link"/></i>
+					<span>{{ $t('add-emoji.url') }}</span>
 				</ui-input>
-				<ui-input v-model="emoji.aliases">
-					<span>%i18n:@add-emoji.aliases%</span>
-				</ui-input>
-			</ui-horizon-group>
-			<ui-input v-model="emoji.url">
-				<i slot="icon"><fa icon="link"/></i>
-				<span>%i18n:@add-emoji.url%</span>
-			</ui-input>
-			<ui-horizon-group>
-				<ui-button @click="updateEmoji(emoji)"><fa :icon="['far', 'save']"/> %i18n:@emojis.update%</ui-button>
-				<ui-button @click="removeEmoji(emoji)"><fa :icon="['far', 'trash-alt']"/> %i18n:@emojis.remove%</ui-button>
-			</ui-horizon-group>
+				<ui-horizon-group class="fit-bottom">
+					<ui-button @click="updateEmoji(emoji)"><fa :icon="['far', 'save']"/> {{ $t('emojis.update') }}</ui-button>
+					<ui-button @click="removeEmoji(emoji)"><fa :icon="['far', 'trash-alt']"/> {{ $t('emojis.remove') }}</ui-button>
+				</ui-horizon-group>
+			</div>
 		</section>
 	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/emoji.vue'),
 	data() {
 		return {
 			name: '',
 			url: '',
 			aliases: '',
-			emojis: []
+			emojis: [],
+			faGrin
 		};
 	},
 
@@ -66,18 +74,18 @@ export default Vue.extend({
 
 	methods: {
 		add() {
-			(this as any).api('admin/emoji/add', {
+			this.$root.api('admin/emoji/add', {
 				name: this.name,
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'success',
-					text: '%i18n:@add-emoji.added%'
+					text: this.$t('add-emoji.added')
 				});
 				this.fetchEmojis();
 			}).catch(e => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -85,26 +93,28 @@ export default Vue.extend({
 		},
 
 		fetchEmojis() {
-			(this as any).api('admin/emoji/list').then(emojis => {
+			this.$root.api('admin/emoji/list').then(emojis => {
 				emojis.reverse();
-				emojis.forEach(e => e.aliases = (e.aliases || []).join(' '));
+				for (const e of emojis) {
+					e.aliases = (e.aliases || []).join(' ');
+				}
 				this.emojis = emojis;
 			});
 		},
 
 		updateEmoji(emoji) {
-			(this as any).api('admin/emoji/update', {
+			this.$root.api('admin/emoji/update', {
 				id: emoji.id,
 				name: emoji.name,
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'success',
-					text: '%i18n:@updated%'
+					text: this.$t('updated')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -112,23 +122,23 @@ export default Vue.extend({
 		},
 
 		removeEmoji(emoji) {
-			this.$swal({
+			this.$root.dialog({
 				type: 'warning',
-				text: '%i18n:@remove-emoji.are-you-sure%'.replace('$1', emoji.name),
+				text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
 				showCancelButton: true
-			}).then(res => {
-				if (!res.value) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 
-				(this as any).api('admin/emoji/remove', {
+				this.$root.api('admin/emoji/remove', {
 					id: emoji.id
 				}).then(() => {
-					this.$swal({
+					this.$root.dialog({
 						type: 'success',
-						text: '%i18n:@remove-emoji.removed%'
+						text: this.$t('remove-emoji.removed')
 					});
 					this.fetchEmojis();
 				}).catch(e => {
-					this.$swal({
+					this.$root.dialog({
 						type: 'error',
 						text: e
 					});
@@ -140,8 +150,21 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.tumhkfkmgtvzljezfvmgkeurkfncshbe
+.oryfrbft
 	@media (min-width 500px)
-		padding 16px
+		display flex
+
+	> div:first-child
+		@media (max-width 500px)
+			padding-bottom 16px
+
+		> img
+			vertical-align bottom
+
+	> div:last-child
+		flex 1
+
+		@media (min-width 500px)
+			padding-left 16px
 
 </style>

src/client/app/admin/views/hashtags.vue

@@ -1,46 +1,41 @@
 <template>
 <div>
 	<ui-card>
-		<div slot="title">%i18n:@hided-tags%</div>
+		<div slot="title">{{ $t('hided-tags') }}</div>
 		<section>
 			<textarea class="jdnqwkzlnxcfftthoybjxrebyolvoucw" v-model="hidedTags"></textarea>
-			<ui-button @click="save">%i18n:@save%</ui-button>
+			<ui-button @click="save">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/hashtags.vue'),
 	data() {
 		return {
 			hidedTags: '',
 		};
 	},
 	created() {
-		(this as any).os.getMeta().then(meta => {
+		this.$root.getMeta().then(meta => {
 			this.hidedTags = meta.hidedTags.join('\n');
 		});
 	},
 	methods: {
 		save() {
-			(this as any).api('admin/update-meta', {
+			this.$root.api('admin/update-meta', {
 				hidedTags: this.hidedTags.split('\n')
 			}).then(() => {
-				//(this as any).os.apis.dialog({ text: `Saved` });
+				//this.$root.os.apis.dialog({ text: `Saved` });
 			}).catch(e => {
-				//(this as any).os.apis.dialog({ text: `Failed ${e}` });
+				//this.$root.os.apis.dialog({ text: `Failed ${e}` });
 			});
 		}
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.jdnqwkzlnxcfftthoybjxrebyolvoucw
-	width 100%
-	min-height 300px
-
-</style>

src/client/app/admin/views/index.vue

@@ -15,61 +15,75 @@
 		</div>
 		<div class="me">
 			<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
-			<p class="name">{{ $store.state.i | userName }}</p>
+			<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/>%i18n:@dashboard%</li>
-			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>%i18n:@instance%</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>%i18n:@users%</li>
-			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="['far', 'grin']" fixed-width/>%i18n:@emoji%</li>
-			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>%i18n:@announcements%</li>
-			<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>%i18n:@hashtags%</li>
-
-			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>%i18n:common.drive%</li> -->
-			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
+			<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('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="faShareAlt" 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('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
+			<li @click="nav('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
 		</ul>
 		<div class="back-to-misskey">
-			<a href="/"><fa icon="arrow-left"/> %i18n:@back-to-misskey%</a>
+			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
 		</div>
 		<div class="version">
 			<small>Misskey {{ version }}</small>
 		</div>
 	</nav>
 	<main>
-		<div v-if="page == 'dashboard'"><x-dashboard/></div>
-		<div v-if="page == 'instance'"><x-instance/></div>
-		<div v-if="page == 'users'"><x-users/></div>
-		<div v-if="page == 'emoji'"><x-emoji/></div>
-		<div v-if="page == 'announcements'"><x-announcements/></div>
-		<div v-if="page == 'hashtags'"><x-hashtags/></div>
-		<div v-if="page == 'drive'"></div>
-		<div v-if="page == 'update'"></div>
+		<div class="page">
+			<div v-if="page == 'dashboard'"><x-dashboard/></div>
+			<div v-if="page == 'instance'"><x-instance/></div>
+			<div v-if="page == 'moderators'"><x-moderators/></div>
+			<div v-if="page == 'users'"><x-users/></div>
+			<div v-if="page == 'emoji'"><x-emoji/></div>
+			<div v-if="page == 'announcements'"><x-announcements/></div>
+			<div v-if="page == 'hashtags'"><x-hashtags/></div>
+			<div v-if="page == 'drive'"><x-drive/></div>
+			<div v-if="page == 'abuse'"><x-abuse/></div>
+		</div>
 	</main>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
 import { version } from '../../config';
 import XDashboard from "./dashboard.vue";
 import XInstance from "./instance.vue";
+import XModerators from "./moderators.vue";
 import XEmoji from "./emoji.vue";
 import XAnnouncements from "./announcements.vue";
 import XHashtags from "./hashtags.vue";
 import XUsers from "./users.vue";
+import XDrive from "./drive.vue";
+import XAbuse from "./abuse.vue";
+import { faHeadset, faArrowLeft, faShareAlt, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 // Detect the user agent
 const ua = navigator.userAgent.toLowerCase();
 const isMobile = /mobile|iphone|ipad|android/.test(ua);
 
 export default Vue.extend({
+	i18n: i18n('admin/views/index.vue'),
 	components: {
 		XDashboard,
 		XInstance,
+		XModerators,
 		XEmoji,
 		XAnnouncements,
 		XHashtags,
-		XUsers
+		XUsers,
+		XDrive,
+		XAbuse,
 	},
 	provide: {
 		isMobile
@@ -79,7 +93,12 @@ export default Vue.extend({
 			page: 'dashboard',
 			version,
 			isMobile,
-			navOpend: !isMobile
+			navOpend: !isMobile,
+			faGrin,
+			faArrowLeft,
+			faHeadset,
+			faShareAlt,
+			faExclamationCircle
 		};
 	},
 	methods: {
@@ -90,7 +109,7 @@ export default Vue.extend({
 });
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mk-admin
 	$headerHeight = 48px
 
@@ -251,7 +270,12 @@ export default Vue.extend({
 	> main
 		width 100%
 		padding 0 0 0 250px
-		max-width 1300px
+
+		> .page
+			max-width 1150px
+
+			@media (min-width 500px)
+				padding 16px
 
 	&.isMobile
 		> main

src/client/app/admin/views/instance.vue

@@ -1,94 +1,161 @@
 <template>
-<div class="axbwjelsbymowqjyywpirzhdlszoncqs">
+<div>
 	<ui-card>
-		<div slot="title"><fa icon="cog"/> %i18n:@instance%</div>
+		<div slot="title"><fa icon="cog"/> {{ $t('instance') }}</div>
 		<section class="fit-top fit-bottom">
-			<ui-input v-model="name">%i18n:@instance-name%</ui-input>
-			<ui-textarea v-model="description">%i18n:@instance-description%</ui-textarea>
-			<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>%i18n:@banner-url%</ui-input>
-			<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>%i18n:@languages%<span slot="desc">%i18n:@languages-desc%</span></ui-input>
+			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
+			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
+			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
+			<ui-input v-model="mascotImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('logo-url') }}</ui-input>
+			<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('banner-url') }}</ui-input>
+			<ui-input v-model="errorImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('error-image-url') }}</ui-input>
+			<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="headset"/> %i18n:@maintainer-config%</header>
-			<ui-input v-model="maintainerName">%i18n:@maintainer-name%</ui-input>
-			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>%i18n:@maintainer-email%</ui-input>
+			<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
+			<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
+			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="farEnvelope"/></i>{{ $t('maintainer-email') }}</ui-input>
 		</section>
 		<section class="fit-top fit-bottom">
-			<ui-input v-model="maxNoteTextLength">%i18n:@max-note-text-length%</ui-input>
+			<ui-input v-model="maxNoteTextLength">{{ $t('max-note-text-length') }}</ui-input>
+		</section>
+		<section>
+			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
+			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
+			<ui-switch v-model="disableGlobalTimeline">{{ $t('disable-global-timeline') }}</ui-switch>
+			<ui-info>{{ $t('disabling-timelines-info') }}</ui-info>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="cloud"/> %i18n:@drive-config%</header>
-			<ui-switch v-model="cacheRemoteFiles">%i18n:@cache-remote-files%<span slot="desc">%i18n:@cache-remote-files-desc%</span></ui-switch>
-			<ui-input v-model="localDriveCapacityMb" type="number">%i18n:@local-drive-capacity-mb%<span slot="suffix">MB</span><span slot="desc">%i18n:@mb%</span></ui-input>
-			<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">%i18n:@remote-drive-capacity-mb%<span slot="suffix">MB</span><span slot="desc">%i18n:@mb%</span></ui-input>
+			<header><fa icon="cloud"/> {{ $t('drive-config') }}</header>
+			<ui-switch v-model="cacheRemoteFiles">{{ $t('cache-remote-files') }}<span slot="desc">{{ $t('cache-remote-files-desc') }}</span></ui-switch>
+			<ui-input v-model="localDriveCapacityMb" type="number">{{ $t('local-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
+			<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="shield-alt"/> %i18n:@recaptcha-config%</header>
-			<ui-switch v-model="enableRecaptcha">%i18n:@enable-recaptcha%</ui-switch>
-			<ui-info>%i18n:@recaptcha-info%</ui-info>
-			<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>%i18n:@recaptcha-site-key%</ui-input>
-			<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>%i18n:@recaptcha-secret-key%</ui-input>
+			<header><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</header>
+			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
+			<ui-info>{{ $t('recaptcha-info') }}</ui-info>
+			<ui-horizon-group inputs>
+				<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-site-key') }}</ui-input>
+				<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-secret-key') }}</ui-input>
+			</ui-horizon-group>
 		</section>
 		<section>
-			<header><fa icon="ghost"/> %i18n:@proxy-account-config%</header>
-			<ui-info>%i18n:@proxy-account-info%</ui-info>
-			<ui-input v-model="proxyAccount"><span slot="prefix">@</span>%i18n:@proxy-account-username%<span slot="desc">%i18n:@proxy-account-username-desc%</span></ui-input>
-			<ui-info warn>%i18n:@proxy-account-warn%</ui-info>
+			<header><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</header>
+			<ui-info>{{ $t('proxy-account-info') }}</ui-info>
+			<ui-input v-model="proxyAccount"><span slot="prefix">@</span>{{ $t('proxy-account-username') }}<span slot="desc">{{ $t('proxy-account-username-desc') }}</span></ui-input>
+			<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
 		</section>
 		<section>
-			<ui-switch v-model="disableRegistration">%i18n:@disable-registration%</ui-switch>
+			<header><fa :icon="farEnvelope"/> {{ $t('email-config') }}</header>
+			<ui-switch v-model="enableEmail">{{ $t('enable-email') }}<span slot="desc">{{ $t('email-config-info') }}</span></ui-switch>
+			<ui-input v-model="email" type="email" :disabled="!enableEmail">{{ $t('email') }}</ui-input>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input>
+				<ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input>
+			</ui-horizon-group>
+			<ui-horizon-group inputs>
+				<ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input>
+				<ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input>
+			</ui-horizon-group>
+			<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<span slot="desc">{{ $t('smtp-secure-info') }}</span></ui-switch>
 		</section>
 		<section>
-			<ui-switch v-model="disableLocalTimeline">%i18n:@disable-local-timeline%</ui-switch>
+			<header><fa :icon="faBolt"/> {{ $t('serviceworker-config') }}</header>
+			<ui-switch v-model="enableServiceWorker">{{ $t('enable-serviceworker') }}<span slot="desc">{{ $t('serviceworker-info') }}</span></ui-switch>
+			<ui-info>{{ $t('vapid-info') }}<br><code>npm i web-push -g<br>web-push generate-vapid-keys</code></ui-info>
+			<ui-horizon-group inputs class="fit-bottom">
+				<ui-input v-model="swPublicKey" :disabled="!enableServiceWorker"><i slot="icon"><fa icon="key"/></i>{{ $t('vapid-publickey') }}</ui-input>
+				<ui-input v-model="swPrivateKey" :disabled="!enableServiceWorker"><i slot="icon"><fa icon="key"/></i>{{ $t('vapid-privatekey') }}</ui-input>
+			</ui-horizon-group>
 		</section>
 		<section>
-			<ui-button @click="updateMeta">%i18n:@save%</ui-button>
+			<header>summaly Proxy</header>
+			<ui-input v-model="summalyProxy">URL</ui-input>
+		</section>
+		<section>
+			<header><fa :icon="faUserPlus"/> {{ $t('user-recommendation-config') }}</header>
+			<ui-switch v-model="enableExternalUserRecommendation">{{ $t('enable-external-user-recommendation') }}</ui-switch>
+			<ui-input v-model="externalUserRecommendationEngine" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-engine') }}<span slot="desc">{{ $t('external-user-recommendation-engine-desc') }}</span></ui-input>
+			<ui-input v-model="externalUserRecommendationTimeout" type="number" :disabled="!enableExternalUserRecommendation">{{ $t('external-user-recommendation-timeout') }}<span slot="suffix">ms</span><span slot="desc">{{ $t('external-user-recommendation-timeout-desc') }}</span></ui-input>
+		</section>
+		<section>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title">%i18n:@invite%</div>
+		<div slot="title">{{ $t('invite') }}</div>
 		<section>
-			<ui-button @click="invite">%i18n:@invite%</ui-button>
+			<ui-button @click="invite">{{ $t('invite') }}</ui-button>
 			<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="['fab', 'twitter']"/> %i18n:@twitter-integration-config%</div>
+		<div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</div>
 		<section>
-			<ui-switch v-model="enableTwitterIntegration">%i18n:@enable-twitter-integration%</ui-switch>
-			<ui-info>%i18n:@twitter-integration-info%</ui-info>
-			<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>%i18n:@twitter-integration-consumer-key%</ui-input>
-			<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>%i18n:@twitter-integration-consumer-secret%</ui-input>
-			<ui-button @click="updateMeta">%i18n:@save%</ui-button>
+			<ui-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</ui-switch>
+			<ui-horizon-group>
+				<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-key') }}</ui-input>
+				<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title"><fa :icon="['fab', 'github']"/> %i18n:@github-integration-config%</div>
+		<div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</div>
 		<section>
-			<ui-switch v-model="enableGithubIntegration">%i18n:@enable-github-integration%</ui-switch>
-			<ui-info>%i18n:@github-integration-info%</ui-info>
-			<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>%i18n:@github-integration-client-id%</ui-input>
-			<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>%i18n:@github-integration-client-secret%</ui-input>
-			<ui-button @click="updateMeta">%i18n:@save%</ui-button>
+			<ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch>
+			<ui-horizon-group>
+				<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-id') }}</ui-input>
+				<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
+		</section>
+	</ui-card>
+
+	<ui-card>
+		<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div>
+		<section>
+			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
+			<ui-horizon-group>
+				<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input>
+				<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input>
+			</ui-horizon-group>
+			<ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info>
+			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { url, host } from '../../config';
+import { toUnicode } from 'punycode';
+import { faHeadset, faShieldAlt, faGhost, faUserPlus, faBolt } from '@fortawesome/free-solid-svg-icons';
+import { faEnvelope as farEnvelope } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/instance.vue'),
+
 	data() {
 		return {
+			url,
+			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,
 			disableRegistration: false,
 			disableLocalTimeline: false,
+			disableGlobalTimeline: false,
+			mascotImageUrl: null,
 			bannerUrl: null,
+			errorImageUrl: null,
 			name: null,
 			description: null,
 			languages: null,
@@ -105,16 +172,39 @@ export default Vue.extend({
 			enableGithubIntegration: false,
 			githubClientId: null,
 			githubClientSecret: null,
+			enableDiscordIntegration: false,
+			discordClientId: null,
+			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
+			enableExternalUserRecommendation: false,
+			externalUserRecommendationEngine: null,
+			externalUserRecommendationTimeout: null,
+			summalyProxy: null,
+			enableEmail: false,
+			email: null,
+			smtpSecure: false,
+			smtpHost: null,
+			smtpPort: null,
+			smtpUser: null,
+			smtpPass: null,
+			enableServiceWorker: false,
+			swPublicKey: null,
+			swPrivateKey: null,
+			faHeadset, faShieldAlt, faGhost, faUserPlus, farEnvelope, faBolt
 		};
 	},
 
 	created() {
-		(this as any).os.getMeta().then(meta => {
+		this.$root.getMeta().then(meta => {
 			this.maintainerName = meta.maintainer.name;
 			this.maintainerEmail = meta.maintainer.email;
+			this.disableRegistration = meta.disableRegistration;
+			this.disableLocalTimeline = meta.disableLocalTimeline;
+			this.disableGlobalTimeline = meta.disableGlobalTimeline;
+			this.mascotImageUrl = meta.mascotImageUrl;
 			this.bannerUrl = meta.bannerUrl;
+			this.errorImageUrl = meta.errorImageUrl;
 			this.name = meta.name;
 			this.description = meta.description;
 			this.languages = meta.langs.join(' ');
@@ -132,15 +222,32 @@ export default Vue.extend({
 			this.enableGithubIntegration = meta.enableGithubIntegration;
 			this.githubClientId = meta.githubClientId;
 			this.githubClientSecret = meta.githubClientSecret;
+			this.enableDiscordIntegration = meta.enableDiscordIntegration;
+			this.discordClientId = meta.discordClientId;
+			this.discordClientSecret = meta.discordClientSecret;
+			this.enableExternalUserRecommendation = meta.enableExternalUserRecommendation;
+			this.externalUserRecommendationEngine = meta.externalUserRecommendationEngine;
+			this.externalUserRecommendationTimeout = meta.externalUserRecommendationTimeout;
+			this.summalyProxy = meta.summalyProxy;
+			this.enableEmail = meta.enableEmail;
+			this.email = meta.email;
+			this.smtpSecure = meta.smtpSecure;
+			this.smtpHost = meta.smtpHost;
+			this.smtpPort = meta.smtpPort;
+			this.smtpUser = meta.smtpUser;
+			this.smtpPass = meta.smtpPass;
+			this.enableServiceWorker = meta.enableServiceWorker;
+			this.swPublicKey = meta.swPublickey;
+			this.swPrivateKey = meta.swPrivateKey;
 		});
 	},
 
 	methods: {
 		invite() {
-			(this as any).api('admin/invite').then(x => {
+			this.$root.api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			}).catch(e => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -148,12 +255,15 @@ export default Vue.extend({
 		},
 
 		updateMeta() {
-			(this as any).api('admin/update-meta', {
+			this.$root.api('admin/update-meta', {
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
 				disableRegistration: this.disableRegistration,
 				disableLocalTimeline: this.disableLocalTimeline,
+				disableGlobalTimeline: this.disableGlobalTimeline,
+				mascotImageUrl: this.mascotImageUrl,
 				bannerUrl: this.bannerUrl,
+				errorImageUrl: this.errorImageUrl,
 				name: this.name,
 				description: this.description,
 				langs: this.languages.split(' '),
@@ -171,13 +281,30 @@ export default Vue.extend({
 				enableGithubIntegration: this.enableGithubIntegration,
 				githubClientId: this.githubClientId,
 				githubClientSecret: this.githubClientSecret,
+				enableDiscordIntegration: this.enableDiscordIntegration,
+				discordClientId: this.discordClientId,
+				discordClientSecret: this.discordClientSecret,
+				enableExternalUserRecommendation: this.enableExternalUserRecommendation,
+				externalUserRecommendationEngine: this.externalUserRecommendationEngine,
+				externalUserRecommendationTimeout: parseInt(this.externalUserRecommendationTimeout, 10),
+				summalyProxy: this.summalyProxy,
+				enableEmail: this.enableEmail,
+				email: this.email,
+				smtpSecure: this.smtpSecure,
+				smtpHost: this.smtpHost,
+				smtpPort: parseInt(this.smtpPort, 10),
+				smtpUser: this.smtpUser,
+				smtpPass: this.smtpPass,
+				enableServiceWorker: this.enableServiceWorker,
+				swPublicKey: this.swPublicKey,
+				swPrivateKey: this.swPrivateKey
 			}).then(() => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'success',
-					text: '%i18n:@saved%'
+					text: this.$t('saved')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -186,10 +313,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.axbwjelsbymowqjyywpirzhdlszoncqs
-	@media (min-width 500px)
-		padding 16px
-
-</style>

src/client/app/admin/views/moderators.vue

@@ -0,0 +1,77 @@
+<template>
+<div>
+	<ui-card>
+		<div slot="title"><fa icon="plus"/> {{ $t('add-moderator.title') }}</div>
+		<section class="fit-top">
+			<ui-input v-model="username" type="text">
+				<span slot="prefix">@</span>
+			</ui-input>
+			<ui-button @click="add" :disabled="changing">{{ $t('add-moderator.add') }}</ui-button>
+			<ui-button @click="remove" :disabled="changing">{{ $t('add-moderator.remove') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import parseAcct from "../../../../misc/acct/parse";
+
+export default Vue.extend({
+	i18n: i18n('admin/views/moderators.vue'),
+
+	data() {
+		return {
+			username: '',
+			changing: false
+		};
+	},
+
+	methods: {
+		async add() {
+			this.changing = true;
+
+			const process = async () => {
+				const user = await this.$root.api('users/show', parseAcct(this.username));
+				await this.$root.api('admin/moderators/add', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('add-moderator.added')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.changing = false;
+		},
+
+		async remove() {
+			this.changing = true;
+
+			const process = async () => {
+				const user = await this.$root.api('users/show', parseAcct(this.username));
+				await this.$root.api('admin/moderators/remove', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('add-moderator.removed')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.changing = false;
+		},
+	}
+});
+</script>

src/client/app/admin/views/users.vue

@@ -1,77 +1,188 @@
 <template>
-<div class="ucnffhbtogqgscfmqcymwmmupoknpfsw">
+<div>
 	<ui-card>
-		<div slot="title">%i18n:@verify-user%</div>
+		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="verifyUsername" type="text">
-				<span slot="prefix">@</span>
+			<ui-input v-model="target" type="text">
+				<span>{{ $t('username-or-userid') }}</span>
 			</ui-input>
-			<ui-button @click="verifyUser" :disabled="verifying">%i18n:@verify%</ui-button>
+			<ui-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('reset-password') }}</ui-button>
+			<ui-horizon-group>
+				<ui-button @click="verifyUser" :disabled="verifying"><fa :icon="faCertificate"/> {{ $t('verify') }}</ui-button>
+				<ui-button @click="unverifyUser" :disabled="unverifying">{{ $t('unverify') }}</ui-button>
+			</ui-horizon-group>
+			<ui-horizon-group>
+				<ui-button @click="suspendUser" :disabled="suspending"><fa :icon="faSnowflake"/> {{ $t('suspend') }}</ui-button>
+				<ui-button @click="unsuspendUser" :disabled="unsuspending">{{ $t('unsuspend') }}</ui-button>
+			</ui-horizon-group>
+			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<ui-textarea v-if="user" :value="user | json5" readonly tall style="margin-top:16px;"></ui-textarea>
 		</section>
 	</ui-card>
 
 	<ui-card>
-		<div slot="title">%i18n:@unverify-user%</div>
+		<div slot="title"><fa :icon="faUsers"/> {{ $t('users.title') }}</div>
 		<section class="fit-top">
-			<ui-input v-model="unverifyUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unverifyUser" :disabled="unverifying">%i18n:@unverify%</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">%i18n:@suspend-user%</div>
-		<section class="fit-top">
-			<ui-input v-model="suspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="suspendUser" :disabled="suspending">%i18n:@suspend%</ui-button>
-		</section>
-	</ui-card>
-
-	<ui-card>
-		<div slot="title">%i18n:@unsuspend-user%</div>
-		<section class="fit-top">
-			<ui-input v-model="unsuspendUsername" type="text">
-				<span slot="prefix">@</span>
-			</ui-input>
-			<ui-button @click="unsuspendUser" :disabled="unsuspending">%i18n:@unsuspend%</ui-button>
+			<ui-horizon-group inputs>
+				<ui-select v-model="sort">
+					<span slot="label">{{ $t('users.sort.title') }}</span>
+					<option value="-createdAt">{{ $t('users.sort.createdAtAsc') }}</option>
+					<option value="+createdAt">{{ $t('users.sort.createdAtDesc') }}</option>
+					<option value="-updatedAt">{{ $t('users.sort.updatedAtAsc') }}</option>
+					<option value="+updatedAt">{{ $t('users.sort.updatedAtDesc') }}</option>
+				</ui-select>
+				<ui-select v-model="state">
+					<span slot="label">{{ $t('users.state.title') }}</span>
+					<option value="all">{{ $t('users.state.all') }}</option>
+					<option value="admin">{{ $t('users.state.admin') }}</option>
+					<option value="moderator">{{ $t('users.state.moderator') }}</option>
+					<option value="verified">{{ $t('users.state.verified') }}</option>
+					<option value="suspended">{{ $t('users.state.suspended') }}</option>
+				</ui-select>
+				<ui-select v-model="origin">
+					<span slot="label">{{ $t('users.origin.title') }}</span>
+					<option value="combined">{{ $t('users.origin.combined') }}</option>
+					<option value="local">{{ $t('users.origin.local') }}</option>
+					<option value="remote">{{ $t('users.origin.remote') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div class="kofvwchc" v-for="user in users" :key="user.id">
+					<div>
+						<a :href="user | userPage(null, true)">
+							<mk-avatar class="avatar" :user="user" :disable-link="true"/>
+						</a>
+					</div>
+					<div>
+						<header>
+							<b><mk-user-name :user="user"/></b>
+							<span class="username">@{{ user | acct }}</span>
+							<span class="is-admin" v-if="user.isAdmin">admin</span>
+							<span class="is-moderator" v-if="user.isModerator">moderator</span>
+							<span class="is-verified" v-if="user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
+							<span class="is-suspended" v-if="user.isSuspended" :title="$t('@.suspended-user')"><fa :icon="faSnowflake"/></span>
+						</header>
+						<div>
+							<span>{{ $t('users.updatedAt') }}: <mk-time :time="user.updatedAt" mode="detail"/></span>
+						</div>
+						<div>
+							<span>{{ $t('users.createdAt') }}: <mk-time :time="user.createdAt" mode="detail"/></span>
+						</div>
+					</div>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 
 <script lang="ts">
-import Vue from "vue";
+import Vue from 'vue';
+import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
+import { faCertificate, faUsers, faTerminal, faSearch, faKey } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
+	i18n: i18n('admin/views/users.vue'),
+
 	data() {
 		return {
-			verifyUsername: null,
+			user: null,
+			target: null,
 			verifying: false,
-			unverifyUsername: null,
 			unverifying: false,
-			suspendUsername: null,
 			suspending: false,
-			unsuspendUsername: null,
-			unsuspending: false
+			unsuspending: false,
+			sort: '+createdAt',
+			state: 'all',
+			origin: 'combined',
+			limit: 10,
+			offset: 0,
+			users: [],
+			existMore: false,
+			faTerminal, faCertificate, faUsers, faSnowflake, faSearch, faKey
 		};
 	},
 
+	watch: {
+		sort() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		},
+
+		state() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		},
+
+		origin() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		}
+	},
+
+	mounted() {
+		this.fetchUsers();
+	},
+
 	methods: {
+		async fetchUser() {
+			try {
+				return await this.$root.api('users/show', this.target.startsWith('@') ? parseAcct(this.target) : { userId: this.target });
+			} catch (e) {
+				if (e == 'user not found') {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('user-not-found')
+					});
+				} else {
+					this.$root.dialog({
+						type: 'error',
+						text: e.toString()
+					});
+				}
+			}
+		},
+
+		async showUser() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/show-user', { userId: user.id }).then(info => {
+				this.user = info;
+			});
+		},
+
+		async resetPassword() {
+			const user = await this.fetchUser();
+			this.$root.api('admin/reset-password', { userId: user.id }).then(res => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('password-updated', { password: res.password })
+				});
+			});
+		},
+
 		async verifyUser() {
 			this.verifying = true;
 
 			const process = async () => {
-				const user = await (this as any).os.api('users/show', parseAcct(this.verifyUsername));
-				await (this as any).os.api('admin/verify-user', { userId: user.id });
-				//(this as any).os.apis.dialog({ text: '%i18n:@verified%' });
+				const user = await this.fetchUser();
+				await this.$root.api('admin/verify-user', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('verified')
+				});
 			};
 
 			await process().catch(e => {
-				//(this as any).os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.verifying = false;
@@ -81,13 +192,19 @@ export default Vue.extend({
 			this.unverifying = true;
 
 			const process = async () => {
-				const user = await (this as any).os.api('users/show', parseAcct(this.unverifyUsername));
-				await (this as any).os.api('admin/unverify-user', { userId: user.id });
-				//(this as any).os.apis.dialog({ text: '%i18n:@unverified%' });
+				const user = await this.fetchUser();
+				await this.$root.api('admin/unverify-user', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('unverified')
+				});
 			};
 
 			await process().catch(e => {
-				//(this as any).os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.unverifying = false;
@@ -97,13 +214,19 @@ export default Vue.extend({
 			this.suspending = true;
 
 			const process = async () => {
-				const user = await (this as any).os.api('users/show', parseAcct(this.suspendUsername));
-				await (this as any).os.api('admin/suspend-user', { userId: user.id });
-				//(this as any).os.apis.dialog({ text: '%i18n:@suspended%' });
+				const user = await this.fetchUser();
+				await this.$root.api('admin/suspend-user', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('suspended')
+				});
 			};
 
 			await process().catch(e => {
-				//(this as any).os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.suspending = false;
@@ -113,24 +236,83 @@ export default Vue.extend({
 			this.unsuspending = true;
 
 			const process = async () => {
-				const user = await (this as any).os.api('users/show', parseAcct(this.unsuspendUsername));
-				await (this as any).os.api('admin/unsuspend-user', { userId: user.id });
-				//(this as any).os.apis.dialog({ text: '%i18n:@unsuspended%' });
+				const user = await this.fetchUser();
+				await this.$root.api('admin/unsuspend-user', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('unsuspended')
+				});
 			};
 
 			await process().catch(e => {
-				//(this as any).os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
 			});
 
 			this.unsuspending = false;
+		},
+
+		fetchUsers() {
+			this.$root.api('admin/show-users', {
+				state: this.state,
+				origin: this.origin,
+				sort: this.sort,
+				offset: this.offset,
+				limit: this.limit + 1
+			}).then(users => {
+				if (users.length == this.limit + 1) {
+					users.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				this.users = this.users.concat(users);
+				this.offset += this.limit;
+			});
 		}
 	}
 });
 </script>
 
 <style lang="stylus" scoped>
-.ucnffhbtogqgscfmqcymwmmupoknpfsw
-	@media (min-width 500px)
-		padding 16px
+.kofvwchc
+	display flex
+	padding 16px 0
+	border-top solid 1px var(--faceDivider)
 
+	> div:first-child
+		> a
+			> .avatar
+				width 64px
+				height 64px
+
+	> div:last-child
+		flex 1
+		padding-left 16px
+
+		@media (max-width 500px)
+			font-size 14px
+
+		> header
+			> .username
+				margin-left 8px
+				opacity 0.7
+
+			> .is-admin
+			> .is-moderator
+				flex-shrink 0
+				align-self center
+				margin 0 0 0 .5em
+				padding 1px 6px
+				font-size 80%
+				border-radius 3px
+				background var(--noteHeaderAdminBg)
+				color var(--noteHeaderAdminFg)
+
+			> .is-verified
+			> .is-suspended
+				margin 0 0 0 .5em
+				color #4dabf7
 </style>

src/client/app/animation.styl

@@ -10,3 +10,19 @@
 	opacity: 0;
 	transform: scaleY(0);
 }
+
+.entranceFromTop {
+	animation-duration: 0.5s;
+	animation-name: entranceFromTop;
+}
+
+@keyframes entranceFromTop {
+	from {
+		opacity: 0;
+		transform: translateY(-64px);
+	}
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}

src/client/app/app.styl

@@ -13,13 +13,6 @@ html
 body
 	overflow-wrap break-word
 
-#error
-	padding 32px
-	color #fff
-
-	hr
-		border solid 1px #fff
-
 #nprogress
 	pointer-events none
 
@@ -130,29 +123,3 @@ pre
 
 [data-icon]
 	display inline-block
-
-.swal2-container
-	z-index 10000 !important
-
-	&.swal2-shown
-		background-color rgba(0, 0, 0, 0.5) !important
-
-.swal2-popup
-	background var(--face) !important
-
-.swal2-content
-	color var(--text) !important
-
-.swal2-confirm
-	background-color var(--primary) !important
-	border-left-color var(--primary) !important
-	border-right-color var(--primary) !important
-	color var(--primaryForeground) !important
-
-	&:hover
-		background-image none !important
-		background-color var(--primaryDarken5) !important
-
-	&:active
-		background-image none !important
-		background-color var(--primaryDarken5) !important

src/client/app/auth/script.ts

@@ -9,20 +9,19 @@ import './style.styl';
 
 import init from '../init';
 import Index from './views/index.vue';
-import * as config from '../config';
+import NotFound from '../common/views/pages/not-found.vue';
 
 /**
  * init
  */
 init(launch => {
-	document.title = `${config.name} | %i18n:common.application-authorization%`;
-
 	// Init router
 	const router = new VueRouter({
 		mode: 'history',
 		base: '/auth/',
 		routes: [
 			{ path: '/:token', component: Index },
+			{ path: '*', component: NotFound }
 		]
 	});
 

src/client/app/auth/views/form.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="form">
 	<header>
-		<h1>%i18n:@share-access%</h1>
+		<h1 v-html="$t('share-access', { name: app.name })"></h1>
 		<img :src="app.iconUrl"/>
 	</header>
 	<div class="app">
@@ -11,32 +11,35 @@
 			<p class="description">{{ app.description }}</p>
 		</section>
 		<section>
-			<h2>%i18n:@permission-ask%</h2>
+			<h2>{{ $t('permission-ask') }}</h2>
 			<ul>
 				<template v-for="p in app.permission">
-					<li v-if="p == 'account-read'">%i18n:@account-read%</li>
-					<li v-if="p == 'account-write'">%i18n:@account-write%</li>
-					<li v-if="p == 'note-write'">%i18n:@note-write%</li>
-					<li v-if="p == 'like-write'">%i18n:@like-write%</li>
-					<li v-if="p == 'following-write'">%i18n:@following-write%</li>
-					<li v-if="p == 'drive-read'">%i18n:@drive-read%</li>
-					<li v-if="p == 'drive-write'">%i18n:@drive-write%</li>
-					<li v-if="p == 'notification-read'">%i18n:@notification-read%</li>
-					<li v-if="p == 'notification-write'">%i18n:@notification-write%</li>
+					<li v-if="p == 'account-read'">{{ $t('account-read') }}</li>
+					<li v-if="p == 'account-write'">{{ $t('account-write') }}</li>
+					<li v-if="p == 'note-write'">{{ $t('note-write') }}</li>
+					<li v-if="p == 'like-write'">{{ $t('like-write') }}</li>
+					<li v-if="p == 'following-write'">{{ $t('following-write') }}</li>
+					<li v-if="p == 'drive-read'">{{ $t('drive-read') }}</li>
+					<li v-if="p == 'drive-write'">{{ $t('drive-write') }}</li>
+					<li v-if="p == 'notification-read'">{{ $t('notification-read') }}</li>
+					<li v-if="p == 'notification-write'">{{ $t('notification-write') }}</li>
 				</template>
 			</ul>
 		</section>
 	</div>
 	<div class="action">
-		<button @click="cancel">%i18n:@cancel%</button>
-		<button @click="accept">%i18n:@accept%</button>
+		<button @click="cancel">{{ $t('cancel') }}</button>
+		<button @click="accept">{{ $t('accept') }}</button>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
+import i18n from '../../i18n';
+
 export default Vue.extend({
+	i18n: i18n('auth/views/form.vue'),
 	props: ['session'],
 	computed: {
 		app(): any {
@@ -45,7 +48,7 @@ export default Vue.extend({
 	},
 	methods: {
 		cancel() {
-			(this as any).api('auth/deny', {
+			this.$root.api('auth/deny', {
 				token: this.session.token
 			}).then(() => {
 				this.$emit('denied');
@@ -53,7 +56,7 @@ export default Vue.extend({
 		},
 
 		accept() {
-			(this as any).api('auth/accept', {
+			this.$root.api('auth/accept', {
 				token: this.session.token
 			}).then(() => {
 				this.$emit('accepted');

src/client/app/auth/views/index.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="index">
 	<main v-if="$store.getters.isSignedIn">
-		<p class="fetching" v-if="fetching">%i18n:@loading%<mk-ellipsis/></p>
+		<p class="fetching" v-if="fetching">{{ $t('loading') }}<mk-ellipsis/></p>
 		<x-form
 			class="form"
 			ref="form"
@@ -11,20 +11,20 @@
 			@accepted="accepted"
 		/>
 		<div class="denied" v-if="state == 'denied'">
-			<h1>%i18n:@denied%</h1>
-			<p>%i18n:@denied-paragraph%</p>
+			<h1>{{ $t('denied') }}</h1>
+			<p>{{ $t('denied-paragraph') }}</p>
 		</div>
 		<div class="accepted" v-if="state == 'accepted'">
-			<h1>{{ session.app.isAuthorized ? '%i18n:@already-authorized%' : '%i18n:@allowed%' }}</h1>
-			<p v-if="session.app.callbackUrl">%i18n:@callback-url%<mk-ellipsis/></p>
-			<p v-if="!session.app.callbackUrl">%i18n:@please-go-back%</p>
+			<h1>{{ session.app.isAuthorized ? this.$t('already-authorized') : this.$t('allowed') }}</h1>
+			<p v-if="session.app.callbackUrl">{{ $t('callback-url') }}<mk-ellipsis/></p>
+			<p v-if="!session.app.callbackUrl">{{ $t('please-go-back') }}</p>
 		</div>
 		<div class="error" v-if="state == 'fetch-session-error'">
-			<p>%i18n:@error%</p>
+			<p>{{ $t('error') }}</p>
 		</div>
 	</main>
 	<main class="signin" v-if="!$store.getters.isSignedIn">
-		<h1>%i18n:@sign-in%</h1>
+		<h1>{{ $t('sign-in') }}</h1>
 		<mk-signin/>
 	</main>
 	<footer><img src="/assets/auth/icon.svg" alt="Misskey"/></footer>
@@ -33,9 +33,11 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import i18n from '../../i18n';
 import XForm from './form.vue';
 
 export default Vue.extend({
+	i18n: i18n('auth/views/index.vue'),
 	components: {
 		XForm
 	},
@@ -55,7 +57,7 @@ export default Vue.extend({
 		if (!this.$store.getters.isSignedIn) return;
 
 		// Fetch session
-		(this as any).api('auth/session/show', {
+		this.$root.api('auth/session/show', {
 			token: this.token
 		}).then(session => {
 			this.session = session;
@@ -63,7 +65,7 @@ export default Vue.extend({
 
 			// 既に連携していた場合
 			if (this.session.app.isAuthorized) {
-				(this as any).api('auth/accept', {
+				this.$root.api('auth/accept', {
 					token: this.session.token
 				}).then(() => {
 					this.accepted();

src/client/app/boot.js

@@ -3,15 +3,9 @@
  * (ENTRY POINT)
  */
 
-/**
- * ドメインに基づいて適切なスクリプトを読み込みます。
- * ユーザーの言語およびモバイル端末か否かも考慮します。
- * webpackは介さないためrequireやimportは使えません。
- */
-
 'use strict';
 
-(function() {
+(async function() {
 	// キャッシュ削除要求があれば従う
 	if (localStorage.getItem('shouldFlush') == 'true') {
 		refresh();
@@ -23,9 +17,9 @@
 	//#region Apply theme
 	const theme = localStorage.getItem('theme');
 	if (theme) {
-		Object.entries(JSON.parse(theme)).forEach(([k, v]) => {
+		for (const [k, v] of Object.entries(JSON.parse(theme))) {
 			document.documentElement.style.setProperty(`--${k}`, v.toString());
-		});
+		}
 	}
 	//#endregion
 
@@ -47,8 +41,12 @@
 	if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
 	if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
 	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
+	if (`${url.pathname}/`.startsWith('/test/')) app = 'test';
 	//#endregion
 
+	// Script version
+	const ver = localStorage.getItem('v') || VERSION;
+
 	//#region Detect the user language
 	let lang = null;
 
@@ -67,8 +65,21 @@
 		langs.includes(settings.device.lang)) {
 		lang = settings.device.lang;
 	}
+
+	window.lang = lang;
 	//#endregion
 
+	let locale = localStorage.getItem('locale');
+	const localeKey = localStorage.getItem('localeKey');
+
+	if (locale == null || localeKey != `${ver}.${lang}`) {
+		const locale = await fetch(`/assets/locales/${lang}.json?ver=${ver}`)
+			.then(response => response.json());
+
+			localStorage.setItem('locale', JSON.stringify(locale));
+			localStorage.setItem('localeKey', `${ver}.${lang}`);
+	}
+
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
 	const isMobile = /mobile|iphone|ipad|android/.test(ua);
@@ -94,9 +105,6 @@
 		app = isMobile ? 'mobile' : 'desktop';
 	}
 
-	// Script version
-	const ver = localStorage.getItem('v') || VERSION;
-
 	// Get salt query
 	const salt = localStorage.getItem('salt')
 		? `?salt=${localStorage.getItem('salt')}`
@@ -106,7 +114,7 @@
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${app}.${ver}.${lang}.js${salt}`);
+	script.setAttribute('src', `/assets/${app}.${ver}.js${salt}`);
 	script.setAttribute('async', 'true');
 	script.setAttribute('defer', 'true');
 	head.appendChild(script);
@@ -142,6 +150,8 @@
 	function refresh() {
 		localStorage.setItem('shouldFlush', 'false');
 
+		localStorage.removeItem('locale');
+
 		// Random
 		localStorage.setItem('salt', Math.random().toString().substr(2, 8));
 
@@ -150,7 +160,7 @@
 			navigator.serviceWorker.controller.postMessage('clear');
 
 			navigator.serviceWorker.getRegistrations().then(registrations => {
-				registrations.forEach(registration => registration.unregister());
+				for (const registration of registrations) registration.unregister();
 			});
 		} catch (e) {
 			console.error(e);

src/client/app/common/define-widget.ts

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 
-export default function<T extends object>(data: {
+export default function <T extends object>(data: {
 	name: string;
 	props?: () => T;
 }) {
@@ -53,11 +53,10 @@ export default function<T extends object>(data: {
 			mergeProps() {
 				if (data.props) {
 					const defaultProps = data.props();
-					Object.keys(defaultProps).forEach(prop => {
-						if (!this.props.hasOwnProperty(prop)) {
-							Vue.set(this.props, prop, defaultProps[prop]);
-						}
-					});
+					for (const prop of Object.keys(defaultProps)) {
+						if (this.props.hasOwnProperty(prop)) continue;
+						Vue.set(this.props, prop, defaultProps[prop]);
+					}
 				}
 			},
 
@@ -66,7 +65,7 @@ export default function<T extends object>(data: {
 
 				this.bakeProps();
 
-				(this as any).api('i/update_widget', {
+				this.$root.api('i/update_widget', {
 					id: this.id,
 					data: this.props
 				});

src/client/app/common/hotkey.ts

@@ -28,15 +28,15 @@ const getKeyMap = keymap => Object.entries(keymap).map(([patterns, callback]): a
 			shift: false
 		} as pattern;
 
-		part.trim().split('+').forEach(key => {
-			key = key.trim().toLowerCase();
+		const keys = part.trim().split('+').map(x => x.trim().toLowerCase());
+		for (const key of keys) {
 			switch (key) {
 				case 'ctrl': pattern.ctrl = true; break;
 				case 'alt': pattern.alt = true; break;
 				case 'shift': pattern.shift = true; break;
 				default: pattern.which = keyCode(key).map(k => k.toLowerCase());
 			}
-		});
+		}
 
 		return pattern;
 	});
@@ -77,11 +77,7 @@ export default {
 						const matched = match(e, action.patterns);
 
 						if (matched) {
-							if (el._hotkey_global) {
-								if (match(e, targetReservedKeys)) {
-									return;
-								}
-							}
+							if (el._hotkey_global && match(e, targetReservedKeys)) return;
 
 							e.preventDefault();
 							e.stopPropagation();

src/client/app/common/scripts/check-for-update.ts

@@ -1,8 +1,7 @@
-import MiOS from '../../mios';
 import { clientVersion as current } from '../../config';
 
-export default async function(mios: MiOS, force = false, silent = false) {
-	const meta = await mios.getMeta(force);
+export default async function($root: any, force = false, silent = false) {
+	const meta = await $root.getMeta(force);
 	const newer = meta.clientVersion;
 
 	if (newer != current) {
@@ -15,19 +14,20 @@ export default async function(mios: MiOS, force = false, silent = false) {
 				navigator.serviceWorker.controller.postMessage('clear');
 			}
 
-			navigator.serviceWorker.getRegistrations().then(registrations => {
-				registrations.forEach(registration => registration.unregister());
-			});
+			const registrations = await navigator.serviceWorker.getRegistrations();
+			for (const registration of registrations) {
+				registration.unregister();
+			}
 		} catch (e) {
 			console.error(e);
 		}
 
-		if (!silent) {
-			mios.apis.dialog({
-				title: '%i18n:common.update-available-title%',
-				text: '%i18n:common.update-available%'.replace('{newer}', newer).replace('{current}', current)
+		/*if (!silent) {
+			$root.dialog({
+				title: $root.$t('@.update-available-title'),
+				text: $root.$t('@.update-available', { newer, current })
 			});
-		}
+		}*/
 
 		return newer;
 	} else {

src/client/app/common/scripts/compose-notification.ts

@@ -22,7 +22,7 @@ export default function(type, data): Notification {
 
 		case 'unreadMessagingMessage':
 			return {
-				title: '%i18n:common.notification.message-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.message-from%'.split("{}")[1] ,
+				title: '%i18n:common.notification.message-from%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.message-from%'.split('{}')[1] ,
 				body: data.text, // TODO: getMessagingMessageSummary(data),
 				icon: data.user.avatarUrl
 			};
@@ -30,7 +30,7 @@ export default function(type, data): Notification {
 		case 'reversiInvited':
 			return {
 				title: '%i18n:common.notification.reversi-invited%',
-				body: '%i18n:common.notification.reversi-invited-by%'.split("{}")[0] + `${getUserName(data.parent)}` + '%i18n:common.notification.reversi-invited-by%'.split("{}")[1],
+				body: '%i18n:common.notification.reversi-invited-by%'.split('{}')[0] + `${getUserName(data.parent)}` + '%i18n:common.notification.reversi-invited-by%'.split('{}')[1],
 				icon: data.parent.avatarUrl
 			};
 
@@ -38,21 +38,21 @@ export default function(type, data): Notification {
 			switch (data.type) {
 				case 'mention':
 					return {
-						title: '%i18n:common.notification.notified-by%'.split("{}")[0] + `${getUserName(data.user)}:` + '%i18n:common.notification.notified-by%'.split("{}")[1],
+						title: '%i18n:common.notification.notified-by%'.split('{}')[0] + `${getUserName(data.user)}:` + '%i18n:common.notification.notified-by%'.split('{}')[1],
 						body: getNoteSummary(data),
 						icon: data.user.avatarUrl
 					};
 
 				case 'reply':
 					return {
-						title: '%i18n:common.notification.reply-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.reply-from%'.split("{}")[1],
+						title: '%i18n:common.notification.reply-from%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.reply-from%'.split('{}')[1],
 						body: getNoteSummary(data),
 						icon: data.user.avatarUrl
 					};
 
 				case 'quote':
 					return {
-						title: '%i18n:common.notification.quoted-by%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.quoted-by%'.split("{}")[1],
+						title: '%i18n:common.notification.quoted-by%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.quoted-by%'.split('{}')[1],
 						body: getNoteSummary(data),
 						icon: data.user.avatarUrl
 					};

src/client/app/common/scripts/format-uptime.ts

@@ -0,0 +1,25 @@
+
+/**
+ * Format like the uptime command
+ */
+export default function(sec) {
+	if (!sec) return sec;
+
+	const day = Math.floor(sec / 86400);
+	const tod = sec % 86400;
+
+	// Days part in string: 2 days, 1 day, null
+	const d = day >= 2 ? `${day} days` : day >= 1 ? `${day} day` : null;
+
+	// Time part in string: 1 sec, 1 min, 1:01
+	const t
+		= tod < 60 ? `${Math.floor(tod)} sec`
+		: tod < 3600 ? `${Math.floor(tod / 60)} min`
+		: `${Math.floor(tod / 60 / 60)}:${Math.floor((tod / 60) % 60).toString().padStart(2, '0')}`;
+
+	let str = '';
+	if (d) str += `${d}, `;
+	str += t;
+
+	return str;
+}

src/client/app/common/scripts/fuck-ad-block.ts

@@ -1,15 +1,12 @@
 declare const fuckAdBlock: any;
 
-export default (os) => {
+export default ($root: any) => {
 	require('fuckadblock');
 
 	function adBlockDetected() {
-		os.apis.dialog({
-			title: '%fa:exclamation-triangle%%i18n:common.adblock.detected%',
-			text: '%i18n:common.adblock.warning%',
-			actins: [{
-				text: 'OK'
-			}]
+		$root.dialog({
+			title: $root.$t('@.adblock.detected'),
+			text: $root.$t('@.adblock.warning')
 		});
 	}
 

src/client/app/common/scripts/get-face.ts

@@ -2,7 +2,7 @@ const faces = [
 	'(=^・・^=)',
 	'v(\'ω\')v',
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
-	'🖕(´･_･`)🖕',
+	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
 	'(Δ・x・Δ)'
 ];

src/client/app/common/scripts/get-md5.ts

@@ -1,8 +1,10 @@
-const crypto = require('crypto');
+// スクリプトサイズがデカい
+//const crypto = require('crypto');
 
 export default (data: ArrayBuffer) => {
-  const buf = new Buffer(data);
-  const hash = crypto.createHash("md5");
-  hash.update(buf);
-  return hash.digest("hex");
-};
+	//const buf = new Buffer(data);
+	//const hash = crypto.createHash('md5');
+	//hash.update(buf);
+	//return hash.digest('hex');
+	return '';
+};

src/client/app/common/scripts/get-median.ts

@@ -1,11 +0,0 @@
-/**
- * 中央値を求めます
- * @param samples サンプル
- */
-export default function(samples) {
-	if (!samples.length) return 0;
-	const numbers = samples.slice(0).sort((a, b) => a - b);
-	const middle = Math.floor(numbers.length / 2);
-	const isEven = numbers.length % 2 === 0;
-	return isEven ? (numbers[middle] + numbers[middle - 1]) / 2 : numbers[middle];
-}

src/client/app/common/scripts/note-mixin.ts

@@ -1,8 +1,8 @@
 import parse from '../../../../mfm/parse';
-import { sum } from '../../../../prelude/array';
+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 Ok from '../views/components/ok.vue';
 
 function focus(el, fn) {
 	const target = fn(el);
@@ -22,7 +22,8 @@ type Opts = {
 export default (opts: Opts = {}) => ({
 	data() {
 		return {
-			showContent: false
+			showContent: false,
+			hideThisNote: false
 		};
 	},
 
@@ -64,6 +65,10 @@ export default (opts: Opts = {}) => ({
 			return this.isRenote ? this.note.renote : this.note;
 		},
 
+		isMyNote(): boolean {
+			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId);
+		},
+
 		reactionsCount(): number {
 			return this.appearNote.reactionCounts
 				? sum(Object.values(this.appearNote.reactionCounts))
@@ -71,24 +76,29 @@ export default (opts: Opts = {}) => ({
 		},
 
 		title(): string {
-			return new Date(this.appearNote.createdAt).toLocaleString();
+			return '';
 		},
 
 		urls(): string[] {
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
-				return ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url);
+				// TODO: 再帰的にURL要素がないか調べる
+				return unique(ast
+					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
+					.map(t => t.node.props.url));
 			} else {
 				return null;
 			}
 		}
 	},
 
+	created() {
+		this.hideThisNote = shouldMuteNote(this.$store.state.i, this.$store.state.settings, this.appearNote);
+	},
+
 	methods: {
 		reply(viaKeyboard = false) {
-			(this as any).apis.post({
+			this.$root.$post({
 				reply: this.appearNote,
 				animation: !viaKeyboard,
 				cb: () => {
@@ -98,7 +108,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		renote(viaKeyboard = false) {
-			(this as any).apis.post({
+			this.$root.$post({
 				renote: this.appearNote,
 				animation: !viaKeyboard,
 				cb: () => {
@@ -115,43 +125,51 @@ export default (opts: Opts = {}) => ({
 
 		react(viaKeyboard = false) {
 			this.blur();
-			(this as any).os.new(MkReactionPicker, {
+			this.$root.new(MkReactionPicker, {
 				source: this.$refs.reactButton,
 				note: this.appearNote,
 				showFocus: viaKeyboard,
-				animation: !viaKeyboard,
-				compact: opts.mobile,
-				big: opts.mobile
+				animation: !viaKeyboard
 			}).$once('closed', this.focus);
 		},
 
 		reactDirectly(reaction) {
-			(this as any).api('notes/reactions/create', {
+			(this.$root.api('notes/reactions/create', {
 				noteId: this.appearNote.id,
 				reaction: reaction
 			});
 		},
 
+		undoReact(note) {
+			const oldReaction = note.myReaction;
+			if (!oldReaction) return;
+			this.$root.api('notes/reactions/delete', {
+				noteId: note.id
+			});
+		},
+
 		favorite() {
-			(this as any).api('notes/favorites/create', {
+			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				(this as any).os.new(Ok);
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
 			});
 		},
 
 		del() {
-			(this as any).api('notes/delete', {
+			this.$root.api('notes/delete', {
 				noteId: this.appearNote.id
 			});
 		},
 
 		menu(viaKeyboard = false) {
-			(this as any).os.new(MkNoteMenu, {
+			this.$root.new(MkNoteMenu, {
 				source: this.$refs.menuButton,
 				note: this.appearNote,
-				animation: !viaKeyboard,
-				compact: opts.mobile,
+				animation: !viaKeyboard
 			}).$once('closed', this.focus);
 		},
 

src/client/app/common/scripts/note-subscriber.ts

@@ -26,7 +26,7 @@ export default prop => ({
 
 	created() {
 		if (this.$store.getters.isSignedIn) {
-			this.connection = (this as any).os.stream;
+			this.connection = this.$root.stream;
 		}
 	},
 
@@ -95,6 +95,7 @@ export default prop => ({
 						Vue.set(this.$_ns_target.reactionCounts, reaction, 0);
 					}
 
+					// Increment the count
 					this.$_ns_target.reactionCounts[reaction]++;
 
 					if (body.userId == this.$store.state.i.id) {
@@ -103,6 +104,26 @@ export default prop => ({
 					break;
 				}
 
+				case 'unreacted': {
+					const reaction = body.reaction;
+
+					if (this.$_ns_target.reactionCounts == null) {
+						return;
+					}
+
+					if (this.$_ns_target.reactionCounts[reaction] == null) {
+						return;
+					}
+
+					// Decrement the count
+					if (this.$_ns_target.reactionCounts[reaction] > 0) this.$_ns_target.reactionCounts[reaction]--;
+
+					if (body.userId == this.$store.state.i.id) {
+						Vue.set(this.$_ns_target, 'myReaction', null);
+					}
+					break;
+				}
+
 				case 'pollVoted': {
 					if (body.userId == this.$store.state.i.id) return;
 					const choice = body.choice;

src/client/app/common/scripts/should-mute-note.ts

@@ -0,0 +1,18 @@
+export default function(me, settings, note) {
+	const isMyNote = note.userId == me.id;
+	const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
+
+	const includesMutedWords = (text: string) =>
+		text
+			? settings.mutedWords.some(q => q.length > 0 && !q.some(word => !text.includes(word)))
+			: false;
+
+	return (
+		(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
+		(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
+		(settings.showMyRenotes === false && isMyNote && isPureRenote) ||
+		(settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
+		(settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
+		(!isMyNote && includesMutedWords(note.text))
+	);
+}