Merge branch 'develop'

.gitattributes

@@ -1,5 +1,3 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
-yarn.lock -diff -text
-package-lock.json -diff -text

.gitignore

@@ -7,9 +7,6 @@
 # Node.js
 /node_modules
 
-# yarn
-yarn.lock
-
 # config
 /.config/*
 !/.config/example.yml

CHANGELOG.md

@@ -1,9 +1,35 @@
 ChangeLog
 =========
 
-If you encounter any problems with updating, please try the following:
+11.26.0 (2019/07/19)
-1. `npm run clean` or `npm run cleanall`
+--------------------
-2. Retry update (Don't forget `npm i`)
+### ✨Improvements
+* モデレーターログを記録して確認できるように
+* Mastodonのリンクの所有者認証に対応
+* AP: Delete Person アクティビティを配信するように
+* AP: Delete アクティビティの後にフォロー解除するように
+* AP: アカウント削除でもDelete activityを配信するように
+* Pages: ラジオボタンを追加
+* AdminページのUsers Viewでユーザーのレコードをクリックすることですぐユーザーを照会できるように
+* AdminページのUsers Viewでユーザー一覧からユーザー名とホスト情報で検索できるように
+* 特定ホストへのメンションの特別処理をクライアントに追加
+* 設定画面でデスクトップ・モバイルモード変更時はすぐにrefreshするか伺うように
+* ペーストされたファイル名のテンプレート変更時すぐどのようになるか見れるように
+* （ｺ｀・ﾍ・´ｹ）を追加
+
+### 🐛Fixes
+* ログインのログが正しく保存されない問題を修正
+* 同じユーザー名のユーザーが作成できてしまうことがある問題を修正
+* 報告されたレポート内容が表示されない問題を修正
+* 「見つける」のタグが大文字小文字区別されている問題を修正
+* 管理画面のインスタンス一覧でソートが正しく機能していない問題を修正
+* プロフィール設定でバナーに動画を設定すると以降編集ができない問題を修正
+* ウェブ検索エンジンの設定でグリッチが発生する問題を修正
+* MFMの引用がインライン表示になっている問題を修正
+* アンケートの期限入力部分のタイトル表示がおかしい問題を修正
+* 画面上の項目がすべていなくなると実際はロードされてないだけのファイルやフォルダーがあるにも関わらず「もっと読み込む」ボタンがなくなり「このフォルダーは空です」っていうplaceholderが表示されてしまう問題を修正
+* proxy-media後のContent-Typeが違う問題を修正
+* ビルド時にエラーが出るのを修正
 
 11.25.1 (2019/07/09)
 --------------------
@@ -641,9 +667,9 @@ mongodb:
   db: misskey
 ```
 3. migration ブランチに切り替え
-4. `npm i`
+4. `yarn install`
-5. `npm run build`
+5. `yarn build`
-6. `npm run migrate`
+6. `yarn migrate`
 7. master ブランチに戻す
 8. enjoy
 

CONTRIBUTING.md

@@ -7,18 +7,18 @@ Feature suggestions and bug reports are filed in https://github.com/syuilo/missk
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.
 
-
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
-Changes you make in Crowdin will be merged into develop branch.
+Changes you make in Crowdin will be merged into the develop branch by @syuilo.
 
-If you can't find the language you want to contribute with, please open an issue.
+If you cannot find the language you want to contribute with, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Internationalization (i18n)
-Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
+Misskey uses the Vue.js plugin [Vue I18n](https://github.com/kazupon/vue-i18n).
+Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/introduction.html .
 
 ## Documentation
 * Documents for contributors are located in [`/docs`](/docs).
@@ -29,9 +29,15 @@ Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 * Test codes are located in [`/test`](/test).
 
 ## Continuous integration
-Misskey uses CircleCI for automated test.
+Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).
 
+## FAQ
+
+### How to resolve conflictions occurred at yarn.lock?
+
+Just execute `yarn` to fix it.
+
 ## Glossary
 ### AP
 Stands for _**A**ctivity**P**ub_.
@@ -51,11 +57,15 @@ Convert な(na) to にゃ(nya)
 #### Denyaize
 Revert Nyaize
 
-## Code style
+## TypeScript Coding Style
-### セミコロンを省略しない
+### Do not omit semicolons
-ASI Hazardを避けるためでもある
+This is to avoid Automatic Semicolon Insertion (ASI) hazard.
 
-### 中括弧を省略しない
+Ref:
+* https://www.ecma-international.org/ecma-262/#sec-automatic-semicolon-insertion
+* https://github.com/tc39/ecma262/pull/1062
+
+### Do not omit curly brackets
 Bad:
 ``` ts
 if (foo)
@@ -73,18 +83,36 @@ if (foo) {
 }
 ```
 
-ただし**`if`が一行**の時だけは省略しても良い
+As a special case, you can omit the curly brackets if
+
+* the body of the `if`-statement have only one statement and,
+* the `if`-statement does not have `else`-clause.
+
 Good:
 ``` ts
 if (foo) bar;
 ```
 
-### `export default`を使わない
+### Do not use `==` when it can simply be replaced with `===`.
-インテリセンスと相性が悪かったりするため
+🥰
 
-参考:
+### Use only boolean (or null related) values in the condition of an `if`-statement.
-* https://gfx.hatenablog.com/entry/2017/11/24/135343
+Bad:
+``` ts
+if (foo.length)
+```
+
+Good:
+``` ts
+if (foo.length > 0)
+```
+
+### Do not use `export default`
+This is because the current language support does not work well with `export default`.
+
+Ref:
 * https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
+* https://gfx.hatenablog.com/entry/2017/11/24/135343
 
 Bad:
 ``` ts

Dockerfile

@@ -23,9 +23,9 @@ RUN apk add --no-cache \
     zlib-dev
 
 COPY package.json ./
-RUN npm i
+RUN yarn install
 COPY . ./
-RUN npm run build
+RUN yarn build
 
 FROM base AS runner
 

README.md

@@ -125,7 +125,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%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://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
@@ -135,7 +134,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
 <td><a href="https://www.patreon.com/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=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
@@ -175,7 +173,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Mon, 01 Jul 2019 21:44:06 UTC
+**Last updated:** Tue, 16 Jul 2019 10:23:06 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright

docs/docker.en.md

@@ -68,7 +68,7 @@ Build misskey with the following:
 *5.* Init DB
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* That is it.

docs/docker.ja.md

@@ -68,7 +68,7 @@ cp docker_example.env docker.env
 *5.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* 以上です！

docs/setup.en.md

@@ -27,6 +27,7 @@ Please install and setup these softwares:
 * **[Redis](https://redis.io/)**
 
 ##### Optional
+* [Yarn](https://yarnpkg.com/) *Optional but recommended for security reason. If you won't install it, use `npx yarn` instead of `yarn`.*
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 * [FFmpeg](https://www.ffmpeg.org/)
 
@@ -50,7 +51,7 @@ Please install and setup these softwares:
 
 5. Install misskey dependencies.
 
-	`npm install`
+	`yarn`
 
 *4.* Configure Misskey
 ----------------------------------------------------------------
@@ -65,21 +66,20 @@ Please install and setup these softwares:
 
 Build misskey with the following:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 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:
 
-1. `npm install -g node-gyp`
+1. `npx node-gyp configure`
-2. `node-gyp configure`
+2. `npx node-gyp build`
-3. `node-gyp build`
+3. `NODE_ENV=production yarn build`
-4. `NODE_ENV=production npm run build`
 
 *6.* Init DB
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* That is it.
@@ -130,12 +130,16 @@ You can check if the service is running with `systemctl status misskey`.
 ### How to update your Misskey server to the latest version
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
+3. `yarn install`
-4. `NODE_ENV=production npm run build`
+4. `NODE_ENV=production yarn build`
-5. `npm run migrate`
+5. `yarn migrate`
 6. Restart your Misskey process to apply changes
 7. Enjoy
 
+If you encounter any problems with updating, please try the following:
+1. `yarn clean` or `yarn cleanall`
+2. Retry update (Don't forget `yarn install`
+
 ----------------------------------------------------------------
 
 If you have any questions or troubles, feel free to contact us!

docs/setup.fr.md

@@ -27,7 +27,8 @@ Installez les paquets suivants :
 * **[Redis](https://redis.io/)**
 
 ##### Optionnels
-* [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+* [Yarn](https://yarnpkg.com/) - *recommander pour des raisons de sécurité. Si vous ne l'installez pas, utilisez `npx yarn` au lieu de` yarn`.*
+* [Elasticsearch](https://www.elastic.co/) - *requis pour pouvoir activer la fonctionnalité de recherche.*
 * [FFmpeg](https://www.ffmpeg.org/)
 
 *3.* Installation de Misskey
@@ -50,7 +51,7 @@ Installez les paquets suivants :
  
 5. Installez les dépendances de misskey.
 
-	`npm install`
+	`yarn install`
 
 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
@@ -65,23 +66,22 @@ Installez les paquets suivants :
 
 Construisez Misskey comme ceci :
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn 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`
+1. `npx node-gyp configure`
-2. `node-gyp configure`
+2. `npx node-gyp build`
-3. `node-gyp build`
+3. `NODE_ENV=production yarn build`
-4. `NODE_ENV=production npm run build`
 
 *6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
 ### Lancement conventionnel
-Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-vous bien !
+Lancez tout simplement `NODE_ENV=production yarn start`. Bonne chance et amusez-vous bien !
 
 ### Démarrage avec systemd
 
@@ -124,9 +124,9 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
+3. `yarn install`
-4. `NODE_ENV=production npm run build`
+4. `NODE_ENV=production yarn build`
-5. `npm run migrate`
+5. `yarn migrate`
 
 ----------------------------------------------------------------
 

docs/setup.ja.md

@@ -27,6 +27,8 @@ adduser --disabled-password --disabled-login misskey
 * **[Redis](https://redis.io/)**
 
 ##### オプション
+* [Yarn](https://yarnpkg.com/)
+	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
 * [FFmpeg](https://www.ffmpeg.org/)
@@ -51,7 +53,7 @@ adduser --disabled-password --disabled-login misskey
 
 5. Misskeyの依存パッケージをインストール
 
-	`npm install`
+	`yarn install`
 
 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
@@ -66,20 +68,19 @@ adduser --disabled-password --disabled-login misskey
 
 次のコマンドでMisskeyをビルドしてください:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
 何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npm install -g node-gyp`
+1. `npx node-gyp configure`
-2. `node-gyp configure`
+2. `npx node-gyp build`
-3. `node-gyp build`
+3. `NODE_ENV=production yarn build`
-4. `NODE_ENV=production npm run build`
 
 *6.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* 以上です！
@@ -87,7 +88,7 @@ npm run init
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
 ### 通常起動
-`NODE_ENV=production npm start`するだけです。GLHF!
+`NODE_ENV=production yarn start`するだけです。GLHF!
 
 ### systemdを用いた起動
 1. systemdサービスのファイルを作成
@@ -131,11 +132,11 @@ npm run init
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
+3. `yarn install`
-4. `NODE_ENV=production npm run build`
+4. `NODE_ENV=production yarn build`
-5. `npm run migrate`
+5. `yarn migrate`
 
-なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
+なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。
 
 ----------------------------------------------------------------
 

locales/cs-CZ.yml

@@ -262,6 +262,8 @@ common:
     load-raw-images: "Zobrazovat obrázky v původní kvalitě"
     load-remote-media: "Zobrazovat média ze vzdáleného serveru"
     sync: "Synchronizace"
+    save: "Uložit"
+    saved: "Uloženo"
   search: "Hledání"
   delete: "Odstranit"
   loading: "Načítám..."
@@ -452,9 +454,12 @@ common/views/components/messaging.vue:
   no-history: "Žádná historie"
   user: "Uživatel"
   group: "Skupina"
+  start-with-user: "Zahájit konverzaci s uživatelem"
+  start-with-group: "Zahájit skupinovou konverzaci"
 common/views/components/messaging-room.vue:
   new-message: "Máte novou zprávu"
 common/views/components/messaging-room.form.vue:
+  input-message-here: "Sem zadejte zprávu"
   send: "Odeslat"
   attach-from-local: "Přiložit soubory z Vašeho zařízení"
 common/views/components/messaging-room.message.vue:
@@ -642,6 +647,7 @@ common/views/components/profile-editor.vue:
   saved: "Profil byl úspěšně aktualizován"
   uploading: "Nahrávám"
   upload-failed: "Nahrávání selhalo"
+  unable-to-process: "Operace nemohla být dokončena."
   email: "Nastavení e-mailů"
   email-address: "Emailová adresa"
   email-verified: "Váš e-mail byl ověřen"
@@ -658,6 +664,7 @@ common/views/components/profile-editor.vue:
   danger-zone: "Nebezpečná zóna"
   delete-account: "Smazat účet"
   account-deleted: "Váš účet byl smazán. Může chvilku trvat než zmizí všechna data."
+  metadata-content: "Obsah"
 common/views/components/user-list-editor.vue:
   users: "Uživatel"
   rename: "Přejmenovat seznam"
@@ -731,6 +738,7 @@ desktop:
   avatar: "Avatar"
   uploading-avatar: "Nahrál nový avatar"
   avatar-updated: "Vaše avatar byl aktualizován"
+  unable-to-process: "Operace nemohla být dokončena."
   invalid-filetype: "Tento formát souboru není podporován"
 desktop/views/components/activity.chart.vue:
   total: "Černá ... Celkem"
@@ -1039,6 +1047,8 @@ admin/views/users.vue:
   reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
   password-updated: "Heslo je nyní \"{password}\""
   update-remote-user: "Aktualizovat informace o vzdáleném účtu"
+  username: "Přezdívka"
+  host: "Hostitel"
   users:
     title: "Uživatel"
     state:
@@ -1055,6 +1065,11 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     title: "Vytvořit moderátora"
+  logs:
+    title: "Logy"
+    moderator: "Moderátoři"
+    type: "Operace"
+    info: "Informace"
 admin/views/emoji.vue:
   add-emoji:
     title: "Přidat emoji"
@@ -1292,6 +1307,8 @@ pages:
       _action:
         _dialog:
           content: "Obsah"
+    _radioButton:
+      title: "Titulek"
   script:
     categories:
       random: "Náhodně"

locales/da-DK.yml

@@ -251,6 +251,8 @@ common:
     disable-via-mobile: "Marker aldrig posten som \"fra mobil\""
     load-raw-images: "Vis vedhæftede bilag i original kvalitet"
     load-remote-media: "Vis medie-materiale fra en ekstern server"
+    save: "Gem"
+    saved: "Gemt"
   search: "Søg"
   delete: "Slet"
   loading: "Henter"
@@ -684,6 +686,7 @@ common/views/components/profile-editor.vue:
   saved: "Profil er opdateret med succes"
   uploading: "Overfører"
   upload-failed: "Fejl ved overførsel"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
   email: "Email indstillinger"
   email-address: "Email adresse"
   email-verified: "Din email er blevet bekræftet"
@@ -703,6 +706,7 @@ common/views/components/profile-editor.vue:
   danger-zone: "Risici"
   delete-account: "Slet kontoen"
   account-deleted: "Kontoen er slettet. Det kan vare lidt, inden alle data forsvinder."
+  metadata-content: "Indhold"
 common/views/components/user-list-editor.vue:
   users: "Bruger"
   rename: "Omdøb listen"
@@ -809,6 +813,7 @@ desktop:
   uploading-avatar: "Overfør en ny avatar"
   avatar-updated: "Avatar er overført med succes"
   choose-avatar: "Vælg et billede til din avatar"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
   invalid-filetype: "Denne filtype kan ikke benyttes her"
 desktop/views/components/activity.chart.vue:
   total: "Sort ... Total"
@@ -1276,6 +1281,8 @@ admin/views/users.vue:
   remote-user-updated: "Informationen om den eksterne bruger er nu blevet opdateret."
   delete-all-files: "Slet alle filer"
   delete-all-files-confirm: "Er du sikker på, at alle filerne skal slettes?"
+  username: "Brugernavn"
+  host: "Vært"
   users:
     title: "Bruger"
     sort:
@@ -1306,6 +1313,11 @@ admin/views/moderators.vue:
     added: "Redaktør er oprettet"
     remove: "Fjern"
     removed: "Redaktøren er nu fjernet"
+  logs:
+    title: "Logs"
+    moderator: "Redaktører"
+    type: "Drift"
+    info: "Information"
 admin/views/emoji.vue:
   add-emoji:
     title: "Tilføj emoji"
@@ -1715,6 +1727,10 @@ pages:
         _dialog:
           content: "Indhold"
         resetRandom: "Nulstil tilfældigt tal"
+    _radioButton:
+      name: "Variabel navn"
+      title: "Titel"
+      default: "Standard værdi"
   script:
     categories:
       flow: "Kontrol"

locales/de-DE.yml

@@ -248,6 +248,8 @@ common:
     disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren"
     load-raw-images: "Anhänge in voller Größe laden"
     load-remote-media: "Zeige Inhalte von fremden Servern"
+    save: "Speichern"
+    saved: "Gespeichert"
   search: "Suche"
   delete: "Löschen"
   loading: "Laden"
@@ -565,6 +567,7 @@ common/views/components/profile-editor.vue:
   avatar: "Avatar"
   banner: "Banner"
   save: "Speichern"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
   export: "Exportieren"
   import: "Importieren"
   export-targets:
@@ -598,6 +601,7 @@ common/views/widgets/memo.vue:
   save: "Speichern"
 desktop:
   banner: "Banner"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
   total: "Schwarz ... komplett"
   notes: "Blau ... Hinweise"
@@ -782,6 +786,7 @@ admin/views/drive.vue:
     local: "Lokal"
   delete: "Löschen"
 admin/views/users.vue:
+  username: "Benutzername"
   users:
     origin:
       local: "Lokal"

locales/en-US.yml

@@ -278,6 +278,8 @@ common:
     load-raw-images: "Show attached images in original quality"
     load-remote-media: "Show media from a remote server"
     sync: "Sync"
+    save: "Save"
+    saved: "Saved"
     home-profile: "Home profile"
     deck-profile: "Deck profile"
   search: "Search"
@@ -710,7 +712,7 @@ common/views/components/profile-editor.vue:
   you-can-include-hashtags: "You can also include hashtags in your profile description."
   language: "Language"
   birthday: "Birthday"
-  avatar: "Icon"
+  avatar: "Avatar"
   banner: "Banner"
   is-cat: "This account is a Cat"
   is-bot: "This account is a Bot"
@@ -723,6 +725,9 @@ common/views/components/profile-editor.vue:
   saved: "Profile updated successfully"
   uploading: "Uploading"
   upload-failed: "Failed to upload"
+  unable-to-process: "The operation could not be completed."
+  avatar-not-an-image: "The file specified as an avatar is not an image"
+  banner-not-an-image: "The file specified as a banner is not an image"
   email: "Email settings"
   email-address: "Email Address"
   email-verified: "Your email has been verified."
@@ -742,6 +747,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Cautious options"
   delete-account: "Remove the account"
   account-deleted: "The account has been deleted. It may take some time until all of the data disappears."
+  profile-metadata: "Profile metadata"
+  metadata-label: "Label"
+  metadata-content: "Content"
 common/views/components/user-list-editor.vue:
   users: "User"
   rename: "Rename list"
@@ -851,6 +859,7 @@ desktop:
   uploading-avatar: "Uploading a new avatar"
   avatar-updated: "Successfully updated the avatar"
   choose-avatar: "Select an image for the avatar"
+  unable-to-process: "The operation could not be completed."
   invalid-filetype: "This filetype is not acceptable here"
 desktop/views/components/activity.chart.vue:
   total: "Black ... Total"
@@ -1363,6 +1372,8 @@ admin/views/users.vue:
   remote-user-updated: "The information regarding the remote user has been updated."
   delete-all-files: "Delete all files"
   delete-all-files-confirm: "Are you sure that you want to delete all files?"
+  username: "Username"
+  host: "Host"
   users:
     title: "Users"
     sort:
@@ -1393,6 +1404,12 @@ admin/views/moderators.vue:
     added: "Registered a Moderator."
     remove: "Discharge"
     removed: "The moderator has been discharged"
+  logs:
+    title: "Logs"
+    moderator: "Moderators"
+    type: "Operations"
+    at: "Timestamp"
+    info: "Information"
 admin/views/emoji.vue:
   add-emoji:
     title: "Add emoji"
@@ -1861,6 +1878,12 @@ pages:
           message: "Message to display when pressed"
           variable: "Variable to send"
           no-variable: "None"
+    radioButton: "Choices"
+    _radioButton:
+      name: "Variable name"
+      title: "Title"
+      values: "Item of choices that delimited by line breaks"
+      default: "Default value"
   script:
     categories:
       flow: "Control"

locales/es-ES.yml

@@ -197,6 +197,8 @@ common:
     update-available-desc: "Las actualizaciones se aplicarán cuando la página se vuelva a cargar."
     advanced-settings: "Configuraciones avanzadas"
     navbar-position-left: "Izquierda"
+    save: "Guardar"
+    saved: "Guardado"
   search: "Buscar"
   delete: "eliminar"
   loading: "cargando"
@@ -567,6 +569,7 @@ common/views/components/profile-editor.vue:
   saved: "Perfil actualizado con exito"
   uploading: "Subiendo"
   upload-failed: "Error al subir"
+  unable-to-process: "La operación no se puede llevar a cabo"
   email: "Preferencias de correo"
   email-address: "Correo electrónico"
   email-verified: "Tu cuenta de correo ha sido verificada."
@@ -669,6 +672,7 @@ desktop:
   uploading-avatar: "Cargando un nuevo avatar"
   avatar-updated: "Avatar actualizado"
   choose-avatar: "Escoge una imagen de avatar"
+  unable-to-process: "La operación no se puede llevar a cabo"
   invalid-filetype: "Este tipo de archivo no es compatible aquí"
 desktop/views/components/activity.chart.vue:
   total: "Negro ... Total"
@@ -962,12 +966,18 @@ admin/views/drive.vue:
   mark-as-sensitive: "Marcar como 'sensible'"
   unmark-as-sensitive: "Desmarcar como 'sensible'"
 admin/views/users.vue:
+  username: "Usuario"
+  host: "Host"
   users:
     state:
       all: "Todo"
       moderator: "Moderadores"
     origin:
       local: "Local"
+admin/views/moderators.vue:
+  logs:
+    title: "Registros"
+    moderator: "Moderadores"
 admin/views/emoji.vue:
   add-emoji:
     add: "Agregar"

locales/fr-FR.yml

@@ -267,6 +267,8 @@ common:
     load-raw-images: "Afficher les photos jointes dans leur qualité originale"
     load-remote-media: "Afficher les médias depuis le serveur distant"
     sync: "Synchroniser"
+    save: "Enregistrer"
+    saved: "enregistré"
   search: "Recherche"
   delete: "Supprimer"
   loading: "Chargement en cours …"
@@ -581,6 +583,11 @@ common/views/components/emoji-picker.vue:
   symbols: "Symboles"
   flags: "Drapeaux"
 common/views/components/settings/app-type.vue:
+  title: "Mode"
+  choices:
+    auto: "Choisir la disposition automatiquement"
+    desktop: "Toujours utiliser la disposition de bureau"
+    mobile: "Toujours utiliser la disposition mobile"
   info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/signin.vue:
   username: "Nom d'utilisateur·rice"
@@ -698,6 +705,7 @@ common/views/components/profile-editor.vue:
   saved: "Profil mis à jour avec succès"
   uploading: "En cours d’envoi …"
   upload-failed: "Échec de l'envoi"
+  unable-to-process: "L'opération n'a pas pu être complétée"
   email: "Paramètres de messagerie"
   email-address: "Adresse de courrier électronique"
   email-verified: "L’adresse du courrier électronique a été vérifiée."
@@ -717,6 +725,7 @@ common/views/components/profile-editor.vue:
   danger-zone: "Zone de danger"
   delete-account: "Supprimer le compte"
   account-deleted: "Le compte a été supprimé. Cela peut prendre un certain temps avant que toutes les données disparaissent."
+  metadata-content: "Contenu"
 common/views/components/user-list-editor.vue:
   users: "Utilisateur·rice"
   rename: "Renommer la liste"
@@ -825,6 +834,7 @@ desktop:
   uploading-avatar: "Téléversement du nouvel avatar"
   avatar-updated: "Mise à jour de l’avatar avec succès"
   choose-avatar: "Choisir un avatar"
+  unable-to-process: "L'opération n'a pas pu être complétée"
   invalid-filetype: "Ce format de fichier n’est pas pris en charge"
 desktop/views/components/activity.chart.vue:
   total: "Noirs ... Total"
@@ -885,6 +895,7 @@ desktop/views/components/drive.folder.vue:
     rename-folder: "Renommer le dossier"
     input-new-folder-name: "Entrer un nouveau nom"
     else-folders: "Avancé"
+    set-as-upload-folder: "Spécifier en tant que dossier de téléversement par défaut"
 desktop/views/components/drive.vue:
   search: "Rechercher"
   empty-draghover: "Drop Welcome!"
@@ -994,6 +1005,7 @@ desktop/views/components/settings.2fa.vue:
   last-used: "Dernière utilisation :"
   activate-key: "Cliquez pour activer la clé de sécurité"
   security-key-name: "Nom de la clé"
+  something-went-wrong: "Oula ! Il y a eu un problème lors de l’enregistrement de la clé."
   key-unregistered: "La clé a été supprimée"
   use-password-less-login: "Utiliser une connexion sans mot de passe"
 common/views/components/media-image.vue:
@@ -1021,6 +1033,7 @@ common/views/components/drive-settings.vue:
   in-use: "utilisé"
   stats: "Statistiques"
   default-upload-folder-name: "Dossier·s"
+  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Silencés / Bloqués"
   mute: "Mettre en sourdine"
@@ -1311,6 +1324,8 @@ admin/views/users.vue:
   remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour"
   delete-all-files: "Supprimer tous les fichiers"
   delete-all-files-confirm: "Êtes vous surs de vouloir supprimer tous les fichiers ?"
+  username: "Nom d'utilisateur·rice"
+  host: "Hôte"
   users:
     title: "Utilisateur·rice·s"
     sort:
@@ -1341,6 +1356,11 @@ admin/views/moderators.vue:
     added: "Ajouté en tant que modérateur"
     remove: "Révoquer"
     removed: "Le modérateur a été révoqué"
+  logs:
+    title: "Journaux"
+    moderator: "Modérateurs"
+    type: "Actions"
+    info: "Informations"
 admin/views/emoji.vue:
   add-emoji:
     title: "Ajouter un émoji"
@@ -1675,6 +1695,7 @@ deck/deck.user-column.vue:
   activity: "Activité"
   timeline: "Fil d’actualité"
   pinned-notes: "Notes épinglées"
+  pinned-page: "Page épinglée"
 docs:
   edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation ?"
   edit-this-page-on-github-link: "Éditez cette page sur GitHub !"
@@ -1790,6 +1811,11 @@ pages:
           message: "Message à afficher lorsque appuyé"
           variable: "Variable à envoyer"
           no-variable: "Aucune"
+    radioButton: "Choix"
+    _radioButton:
+      name: "Nom de la variable"
+      title: "Titre"
+      default: "Valeur par défaut"
   script:
     categories:
       flow: "Contrôle"

locales/ja-JP.yml

@@ -290,6 +290,8 @@ common:
     load-raw-images: "添付された画像を高画質で表示する"
     load-remote-media: "リモートサーバーのメディアを表示する"
     sync: "同期"
+    save: "保存"
+    saved: "保存しました"
     home-profile: "ホームのプロファイル"
     deck-profile: "デッキのプロファイル"
 
@@ -780,6 +782,9 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  unable-to-process: "操作を完了できません"
+  avatar-not-an-image: "アイコンとして指定したファイルは画像ではありません"
+  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
@@ -799,6 +804,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "危険な設定"
   delete-account: "アカウントを削除"
   account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
+  profile-metadata: "プロフィール補足情報"
+  metadata-label: "ラベル"
+  metadata-content: "内容"
 
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
@@ -925,6 +933,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしています"
   avatar-updated: "アバターを更新しました"
   choose-avatar: "アバターにする画像を選択"
+  unable-to-process: "操作を完了できません"
   invalid-filetype: "この形式のファイルはサポートされていません"
 
 desktop/views/components/activity.chart.vue:
@@ -1496,6 +1505,8 @@ admin/views/users.vue:
   remote-user-updated: "リモートユーザー情報を更新しました"
   delete-all-files: "すべてのファイルを削除"
   delete-all-files-confirm: "すべてのファイルを削除しますか？"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     sort:
@@ -1527,6 +1538,12 @@ admin/views/moderators.vue:
     added: "モデレーターを登録しました"
     remove: "解除"
     removed: "モデレーター登録を解除しました"
+  logs:
+    title: "ログ"
+    moderator: "モデレーター"
+    type: "操作"
+    at: "日時"
+    info: "情報"
 
 admin/views/emoji.vue:
   add-emoji:
@@ -2066,6 +2083,13 @@ pages:
           variable: "送信する変数"
           no-variable: "なし"
 
+    radioButton: "選択肢"
+    _radioButton:
+      name: "変数名"
+      title: "タイトル"
+      values: "改行で区切った選択肢"
+      default: "デフォルト値"
+
   script:
     categories:
       flow: "制御"

locales/ja-KS.yml

@@ -123,6 +123,8 @@ common:
     password: "パスワード"
     other: "その他"
     timeline: "タイムライン"
+    save: "保存"
+    saved: "保存したで！"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
@@ -470,6 +472,7 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存したで"
   uploading: "アップロードしとります"
   upload-failed: "これアップロードでけへんわ"
+  unable-to-process: "あかん、無理やわ"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
@@ -563,6 +566,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしとるで"
   avatar-updated: "アバターを更新したで"
   choose-avatar: "アバターにする画像選んでや"
+  unable-to-process: "あかん、無理やわ"
   invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
   total: "黒いの ... 全部"
@@ -942,6 +946,8 @@ admin/views/users.vue:
   reset-password: "パスワードをリセット"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     state:
@@ -949,6 +955,11 @@ admin/views/users.vue:
       moderator: "モデレーター"
     origin:
       local: "ローカル"
+admin/views/moderators.vue:
+  logs:
+    moderator: "モデレーター"
+    type: "操作"
+    info: "情報"
 admin/views/emoji.vue:
   add-emoji:
     add: "増やす"

locales/ko-KR.yml

@@ -278,6 +278,8 @@ common:
     load-raw-images: "첨부 이미지를 고품질로 표시"
     load-remote-media: "원격 서버의 미디어를 표시"
     sync: "동기화"
+    save: "저장"
+    saved: "저장하였습니다"
     home-profile: "홈 프로필"
     deck-profile: "덱 프로필"
   search: "검색"
@@ -723,6 +725,9 @@ common/views/components/profile-editor.vue:
   saved: "프로필을 저장하였습니다"
   uploading: "업로드 중"
   upload-failed: "업로드에 실패하였습니다"
+  unable-to-process: "작업을 완료할 수 없습니다"
+  avatar-not-an-image: "아바타로 지정한 파일이 이미지 형식이 아닙니다"
+  banner-not-an-image: "배너로 지정한 파일이 이미지 형식이 아닙니다"
   email: "메일 설정"
   email-address: "메일 주소"
   email-verified: "매일 주소가 확인되었습니다"
@@ -742,6 +747,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "위험한 설정"
   delete-account: "계정 삭제"
   account-deleted: "계정이 삭제되었습니다. 데이터가 사라질 때까지 시간이 걸릴 수 있습니다."
+  profile-metadata: "프로필 추가 정보"
+  metadata-label: "라벨"
+  metadata-content: "내용"
 common/views/components/user-list-editor.vue:
   users: "사용자"
   rename: "리스트 이름 바꾸기"
@@ -851,6 +859,7 @@ desktop:
   uploading-avatar: "새로운 아바타를 업로드하고 있습니다"
   avatar-updated: "아바타가 변경되었습니다"
   choose-avatar: "아바타 이미지를 선택"
+  unable-to-process: "작업을 완료할 수 없습니다"
   invalid-filetype: "이 형식의 파일은 지원되지 않습니다"
 desktop/views/components/activity.chart.vue:
   total: "검은색 ... 전체"
@@ -892,7 +901,7 @@ desktop/views/components/drive.file.vue:
     copy-url: "URL 복사"
     download: "다운로드"
     else-files: "기타"
-    set-as-avatar: "아이콘으로 설정"
+    set-as-avatar: "아바타로 설정"
     set-as-banner: "배너로 설정"
     open-in-app: "앱에서 열기"
     add-app: "앱 추가"
@@ -1363,6 +1372,8 @@ admin/views/users.vue:
   remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
   delete-all-files: "모든 파일 삭제"
   delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
+  username: "사용자명"
+  host: "관리자"
   users:
     title: "사용자"
     sort:
@@ -1393,6 +1404,12 @@ admin/views/moderators.vue:
     added: "모더레이터를 등록하였습니다"
     remove: "해제"
     removed: "모더레이터 등록을 해제했습니다"
+  logs:
+    title: "로그"
+    moderator: "모더레이터"
+    type: "작업"
+    at: "일시"
+    info: "정보"
 admin/views/emoji.vue:
   add-emoji:
     title: "이모지 등록"
@@ -1861,6 +1878,12 @@ pages:
           message: "눌렀을 때 표시할 메시지"
           variable: "보낼 변수"
           no-variable: "없음"
+    radioButton: "선택지"
+    _radioButton:
+      name: "변수명"
+      title: "제목"
+      values: "줄바꿈으로 구분된 선택지"
+      default: "기본값"
   script:
     categories:
       flow: "흐름 제어"

locales/nl-NL.yml

@@ -199,6 +199,7 @@ common/views/components/profile-editor.vue:
   name: "Naam"
   avatar: "Gebruikersafbeelding"
   banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
   export-targets:
     following-list: "Volgend"
     user-lists: "Lijsten"
@@ -226,6 +227,7 @@ common/views/pages/follow.vue:
   follow: "Volgend"
 desktop:
   banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
   total: "Zwart ... totaal"
   notes: "Blauw ... notities"
@@ -425,6 +427,7 @@ admin/views/drive.vue:
     local: "Lokaal"
   delete: "Verwijderen"
 admin/views/users.vue:
+  username: "Gebruikersnaam"
   users:
     title: "Gebruiker"
     state:

locales/no-NO.yml

@@ -78,6 +78,7 @@ common:
   _settings:
     notification: "Notifikasjon"
     password: "Passord"
+    save: "Lagre"
   search: "Søk"
   delete: "Slett"
   loading: "Laster inn..."
@@ -345,12 +346,16 @@ admin/views/drive.vue:
     local: "Lokalt"
   delete: "Slett"
 admin/views/users.vue:
+  username: "Brukernavn"
   users:
     title: "Bruker"
     state:
       all: "Alle"
     origin:
       local: "Lokalt"
+admin/views/moderators.vue:
+  logs:
+    info: "Informasjon"
 admin/views/emoji.vue:
   add-emoji:
     add: "Legg til"

locales/pl-PL.yml

@@ -178,6 +178,8 @@ common:
     version: "Wersja:"
     do-update: "Sprawdź dostępność nowych aktualizacji"
     navbar-position-left: "Z lewej"
+    save: "Zapisz"
+    saved: "Zapisano"
   search: "Szukaj"
   delete: "Usuń"
   loading: "Ładowanie"
@@ -516,6 +518,7 @@ common/views/components/profile-editor.vue:
   saved: "Pomyślnie zaktualizowano profil"
   uploading: "Wysyłanie"
   upload-failed: "Wysyłanie nie powiodło się"
+  unable-to-process: "Nie udało się ukończyć działania."
   email: "Ustawienia e-mail"
   email-address: "Adres e-mail"
   email-verified: "Twój adres e-mail został zweryfikowany."
@@ -610,6 +613,7 @@ desktop:
   uploading-avatar: "Wysyłanie awatara"
   avatar-updated: "Wysłano awatar"
   choose-avatar: "Wybierz awatar"
+  unable-to-process: "Nie udało się ukończyć działania."
 desktop/views/components/activity.chart.vue:
   total: "Czarny … Łącznie"
   notes: "Niebieski … Wpisy"
@@ -908,6 +912,7 @@ admin/views/drive.vue:
   unmark-as-sensitive: "Cofnij oznaczenie jako zawartość wrażliwą"
 admin/views/users.vue:
   user-not-found: "Nie znaleziono użytkownika"
+  username: "Nazwa użytkownika"
   users:
     title: "Użytkownicy"
     sort:
@@ -923,6 +928,9 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     add: "Zarejestruj się"
+  logs:
+    moderator: "Moderatorzy"
+    info: "Informacje"
 admin/views/emoji.vue:
   add-emoji:
     name: "Nazwa Emoji"
@@ -1212,6 +1220,8 @@ pages:
       text: "Tytuł"
     _button:
       text: "Tytuł"
+    _radioButton:
+      title: "Tytuł"
   script:
     categories:
       random: "Losowy"

locales/zh-CN.yml

@@ -35,6 +35,7 @@ common:
   signout: "退出"
   reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
   fetching-as-ap-object: "联合查询"
+  unfollow-confirm: "取消对{name}的关注？"
   got-it: "知道了"
   customization-tips:
     title: "自定义提示"
@@ -122,6 +123,7 @@ common:
     add-visible-user: "添加用户"
     cw-placeholder: "评论帖子(可选)"
     username-prompt: "输入用户名"
+    enter-file-name: "编辑文件名"
   weekday-short:
     sunday: "日"
     monday: "一"
@@ -188,6 +190,11 @@ common:
     remember-note-visibility: "记住帖子可见性"
     web-search-engine: "搜索引擎"
     web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
+    paste: "粘贴"
+    pasted-file-name: "粘贴的文件名模板"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "粘贴时编辑文件名"
+    paste-dialog-desc: "粘贴时显示编辑文件名的对话框"
     keep-cw: "保留内容警告"
     keep-cw-desc: "在回复帖子时，如果原帖设置了内容警告，默认情况下回帖也会设置相同的内容警告。"
     i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
@@ -271,6 +278,8 @@ common:
     load-raw-images: "以原始质量显示附加图像"
     load-remote-media: "显示来自远程服务器的媒体"
     sync: "同步"
+    save: "保存"
+    saved: "已保存"
     home-profile: "定制首页数据"
     deck-profile: "定制Deck数据"
   search: "搜索"
@@ -523,6 +532,7 @@ common/views/components/note-menu.vue:
   delete: "删除"
   delete-confirm: "确定删除这个投稿吗?"
   remote: "显示原始投稿"
+  pin-limit-exceeded: "无法置顶更多了。"
 common/views/components/user-menu.vue:
   mention: "提到"
   mute: "屏蔽"
@@ -592,6 +602,12 @@ common/views/components/emoji-picker.vue:
   symbols: "符号"
   flags: "旗帜"
 common/views/components/settings/app-type.vue:
+  title: "模式"
+  intro: "您可以指定使用桌面版或移动版。"
+  choices:
+    auto: "自动选择"
+    desktop: "固定为桌面版"
+    mobile: "固定为移动版"
   info: "更改将在刷新页面后生效。"
 common/views/components/signin.vue:
   username: "用户名"
@@ -603,6 +619,8 @@ common/views/components/signin.vue:
   signin-with-github: "用 GitHub 登录"
   signin-with-discord: "用 Discord 登录"
   login-failed: "登录失败。请检查用户名和密码。"
+  tap-key: "点击安全密钥登录"
+  enter-2fa-code: "输入验证码"
 common/views/components/signup.vue:
   invitation-code: "邀请码"
   invitation-info: "如果您没有邀请码，请联系<a href=\"{}\">管理员</a>。"
@@ -707,6 +725,7 @@ common/views/components/profile-editor.vue:
   saved: "您的个人资料已保存"
   uploading: "正在上传"
   upload-failed: "上传失败"
+  unable-to-process: "无法完成操作"
   email: "邮件设置"
   email-address: "电子邮件地址"
   email-verified: "电子邮件地址已验证"
@@ -726,6 +745,7 @@ common/views/components/profile-editor.vue:
   danger-zone: "危险选项"
   delete-account: "删除帐户"
   account-deleted: "帐户已被删除。 数据会在一段时间之后清除。"
+  metadata-content: "内容"
 common/views/components/user-list-editor.vue:
   users: "用户"
   rename: "重命名列表"
@@ -835,6 +855,7 @@ desktop:
   uploading-avatar: "上传一个新的头像"
   avatar-updated: "成功上传头像"
   choose-avatar: "选择作为头像的图片"
+  unable-to-process: "无法完成操作"
   invalid-filetype: "不接受此文件类型"
 desktop/views/components/activity.chart.vue:
   total: "黑 ... 总计"
@@ -885,9 +906,12 @@ desktop/views/components/drive.file.vue:
     copied: "已复制"
     copied-url-to-clipboard: "已复制链接到剪贴板"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "默认上传文件夹"
   unable-to-process: "无法完成操作"
   circular-reference-detected: "目标文件夹是您要移动的文件夹的子文件夹。"
   unhandled-error: "未知错误"
+  unable-to-delete: "无法删除"
+  has-child-files-or-folders: "此文件夹不为空，无法删除。"
   contextmenu:
     move-to-this-folder: "移动到此文件夹"
     show-in-new-window: "在新窗口打开"
@@ -895,6 +919,7 @@ desktop/views/components/drive.folder.vue:
     rename-folder: "重命名文件夹"
     input-new-folder-name: "请输入新文件名"
     else-folders: "其他"
+    set-as-upload-folder: "设置为默认上传文件夹"
 desktop/views/components/drive.vue:
   search: "搜索"
   empty-draghover: "放在这里！因为你知道我很可爱，对吗？"
@@ -1000,6 +1025,16 @@ desktop/views/components/settings.2fa.vue:
   success: "设置完成"
   failed: "设置失败, 请确保您的密钥是正确的。"
   info: "从下次登录Misskey时，您的设备上显示的令牌以及密码也是必需的。"
+  totp-header: "身份验证 App"
+  security-key-header: "安全密钥"
+  security-key: "为了增强安全性，您可以使用支持FIDO2的硬件安全密钥登录您的帐户。 登录时，您将需要注册安全密钥或身份验证应用。"
+  last-used: "最后使用："
+  activate-key: "单击以激活您的安全密钥"
+  security-key-name: "密钥名称"
+  register-security-key: "安全密钥注册完成"
+  something-went-wrong: "糟糕！安全密钥注册出现问题："
+  key-unregistered: "安全密钥已被删除。"
+  use-password-less-login: "使用免密码登录"
 common/views/components/media-image.vue:
   sensitive: "阅读注意"
   click-to-show: "点击查看"
@@ -1024,7 +1059,9 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "已使用"
   stats: "统计"
+  default-upload-folder: "默认上传文件夹"
   default-upload-folder-name: "文件夹"
+  change-default-upload-folder: "更改文件夹"
 common/views/components/mute-and-block.vue:
   mute-and-block: "屏蔽/拉黑"
   mute: "屏蔽"
@@ -1114,6 +1151,9 @@ admin/views/index.vue:
   back-to-misskey: "返回 Misskey"
 admin/views/db.vue:
   tables: "表格"
+  vacuum: "VACUUM"
+  vacuum-info: "清理数据库。 保持数据完整并减少磁盘使用量。 此操作通常会自动定期执行。"
+  vacuum-exclamation: "运行VACUUM之后，数据库上的负载可能会持续一段时间，并且可能不响应用户操作。"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "账户"
@@ -1328,6 +1368,8 @@ admin/views/users.vue:
   remote-user-updated: "远程用户信息已更新"
   delete-all-files: "删除所有文件"
   delete-all-files-confirm: "删除所有文件吗？"
+  username: "用户名"
+  host: "主机名"
   users:
     title: "用户"
     sort:
@@ -1358,6 +1400,12 @@ admin/views/moderators.vue:
     added: "已注册版主。"
     remove: "取消"
     removed: "取消注册版主"
+  logs:
+    title: "登录"
+    moderator: "版主"
+    type: "操作"
+    at: "日期和时间"
+    info: "信息"
 admin/views/emoji.vue:
   add-emoji:
     title: "添加emoji"
@@ -1704,6 +1752,7 @@ deck/deck.user-column.vue:
   activity: "活动"
   timeline: "时间线"
   pinned-notes: "置顶帖"
+  pinned-page: "已置顶的页面"
 docs:
   edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
   edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
@@ -1758,6 +1807,7 @@ pages:
   url: "页面URL"
   summary: "页面摘要"
   align-center: "居中"
+  hide-title-when-pinned: "置顶时隐藏标题"
   font: "字体"
   fontSerif: "衬线字体"
   fontSansSerif: "无衬线字体"
@@ -1811,12 +1861,25 @@ pages:
       inc: "增加值"
     _button:
       text: "标题"
+      colored: "彩色"
       action: "按下按钮时的行为"
       _action:
         dialog: "显示对话框"
         _dialog:
           content: "内容"
         resetRandom: "随机值重置"
+        pushEvent: "发送事件"
+        _pushEvent:
+          event: "事件名称"
+          message: "按下时显示的消息"
+          variable: "发送的变量"
+          no-variable: "空"
+    radioButton: "选择项"
+    _radioButton:
+      name: "变量名"
+      title: "标题"
+      values: "使用换行区分的选择项"
+      default: "默认值"
   script:
     categories:
       flow: "控制"

migration/1562869971568-ModerationLog.ts

@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ModerationLog1562869971568 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
+        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
+        await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
+        await queryRunner.query(`DROP TABLE "moderation_log"`);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.25.1",
+	"version": "11.26.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -27,7 +27,7 @@
 	},
 	"resolutions": {
 		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
-		"video-thumbnail-generator/lodash": "^4.17.11"
+		"video-thumbnail-generator/lodash": "^4.17.13"
 	},
 	"dependencies": {
 		"@elastic/elasticsearch": "7.1.0",
@@ -37,7 +37,6 @@
 		"@fortawesome/free-solid-svg-icons": "5.9.0",
 		"@fortawesome/vue-fontawesome": "0.1.6",
 		"@koa/cors": "3.0.0",
-		"@typescript-eslint/parser": "1.11.0",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.5.15",
 		"@types/cbor": "2.0.0",
@@ -50,7 +49,6 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
-		"@types/is-root": "2.1.2",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.4",
@@ -83,7 +81,7 @@
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.13",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.1",
+		"@types/request": "2.48.2",
 		"@types/request-promise-native": "1.0.16",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
@@ -100,8 +98,9 @@
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
+		"@typescript-eslint/parser": "1.11.0",
 		"animejs": "3.0.1",
-		"apexcharts": "3.8.1",
+		"apexcharts": "3.8.2",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -121,14 +120,14 @@
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.2",
+		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"emojilib": "2.4.0",
 		"eslint": "6.0.1",
 		"eslint-plugin-vue": "5.2.3",
 		"eventemitter3": "4.0.0",
 		"feed": "3.0.0",
-		"file-type": "12.0.0",
+		"file-type": "12.0.1",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
@@ -145,7 +144,7 @@
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.2.0",
+		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
@@ -182,7 +181,7 @@
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
-		"parsimmon": "1.12.0",
+		"parsimmon": "1.12.1",
 		"pg": "7.11.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
@@ -194,7 +193,7 @@
 		"pug": "2.0.4",
 		"punycode": "2.1.1",
 		"pureimage": "0.1.6",
-		"qrcode": "1.3.3",
+		"qrcode": "1.4.0",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
 		"ratelimiter": "3.3.0",
@@ -220,7 +219,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.3.0",
-		"systeminformation": "4.13.1",
+		"systeminformation": "4.14.3",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.3.0",
 		"textarea-caret": "3.1.0",
@@ -243,13 +242,13 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.11.2",
+		"vue-i18n": "8.12.0",
 		"vue-js-modal": "1.3.31",
 		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.6",
+		"vue-router": "3.0.7",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.16",
@@ -259,10 +258,10 @@
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.5",
-		"webpack": "4.35.2",
+		"webpack": "4.35.3",
 		"webpack-cli": "3.3.5",
-		"websocket": "1.0.28",
+		"websocket": "1.0.29",
-		"ws": "7.0.1",
+		"ws": "7.1.0",
 		"xev": "2.0.1"
 	}
 }

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

@@ -12,6 +12,31 @@
 			</ui-horizon-group>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title>{{ $t('logs.title') }}</template>
+		<section class="fit-top">
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div v-for="log in logs" :key="log.id" class="">
+					<ui-horizon-group inputs>
+						<ui-input :value="log.user | acct" type="text" readonly>
+							<span>{{ $t('logs.moderator') }}</span>
+						</ui-input>
+						<ui-input :value="log.type" type="text" readonly>
+							<span>{{ $t('logs.type') }}</span>
+						</ui-input>
+						<ui-input :value="log.createdAt | date" type="text" readonly>
+							<span>{{ $t('logs.at') }}</span>
+						</ui-input>
+					</ui-horizon-group>
+					<ui-textarea :value="JSON.stringify(log.info, null, 4)" readonly>
+						<span>{{ $t('logs.info') }}</span>
+					</ui-textarea>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMoreLogs" @click="fetchLogs">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -26,10 +51,17 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			changing: false
+			changing: false,
+			logs: [],
+			untilLogId: null,
+			existMoreLogs: false
 		};
 	},
 
+	created() {
+		this.fetchLogs();
+	},
+
 	methods: {
 		async add() {
 			this.changing = true;
@@ -74,6 +106,22 @@ export default Vue.extend({
 
 			this.changing = false;
 		},
+
+		fetchLogs() {
+			this.$root.api('admin/show-moderation-logs', {
+				untilId: this.untilId,
+				limit: 10 + 1
+			}).then(logs => {
+				if (logs.length == 10 + 1) {
+					logs.pop();
+					this.existMoreLogs = true;
+				} else {
+					this.existMoreLogs = false;
+				}
+				this.logs = this.logs.concat(logs);
+				this.untilLogId = this.logs[this.logs.length - 1].id;
+			});
+		},
 	}
 });
 </script>

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

@@ -5,7 +5,7 @@
 			<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 		</a>
 	</div>
-	<div>
+	<div @click="click(user.id)">
 		<header>
 			<b><mk-user-name :user="user"/></b>
 			<span class="username">@{{ user | acct }}</span>
@@ -32,7 +32,7 @@ import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
-	props: ['user'],
+	props: ['user', 'click'],
 	data() {
 		return {
 			faSnowflake, faMicrophoneSlash
@@ -44,7 +44,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kofvwchc
 	display flex
-	padding 16px 0
+	padding 16px
 	border-top solid 1px var(--faceDivider)
 
 	> div:first-child
@@ -55,6 +55,7 @@ export default Vue.extend({
 
 	> div:last-child
 		flex 1
+		cursor pointer
 		padding-left 16px
 
 		@media (max-width 500px)
@@ -80,4 +81,15 @@ export default Vue.extend({
 			> .is-suspended
 				margin 0 0 0 .5em
 				color #4dabf7
+
+	&:hover
+		color var(--primaryForeground)
+		background var(--primary)
+		text-decoration none
+		border-radius 3px
+
+	&:active
+		color var(--primaryForeground)
+		background var(--primaryDarken10)
+		border-radius 3px
 </style>

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

@@ -8,7 +8,7 @@
 			</ui-input>
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 
-			<div class="user" v-if="user">
+			<div ref="user" class="user" v-if="user" :key="user.id">
 				<x-user :user="user"/>
 				<div class="actions">
 					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
@@ -54,8 +54,16 @@
 					<option value="remote">{{ $t('users.origin.remote') }}</option>
 				</ui-select>
 			</ui-horizon-group>
+			<ui-horizon-group searchboxes>
+				<ui-input v-model="searchUsername" type="text" spellcheck="false" @input="fetchUsers(true)">
+					<span>{{ $t('username') }}</span>
+				</ui-input>
+				<ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :disabled="origin === 'local'">
+					<span>{{ $t('host') }}</span>
+				</ui-input>
+			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<x-user v-for="user in users" :user='user' :key="user.id"/>
+				<x-user v-for="user in users" :key="user.id" :user='user' :click="showUserOnClick"/>
 			</sequential-entrance>
 			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
@@ -85,6 +93,8 @@ export default Vue.extend({
 			sort: '+createdAt',
 			state: 'all',
 			origin: 'local',
+			searchUsername: '',
+			searchHost: '',
 			limit: 10,
 			offset: 0,
 			users: [],
@@ -107,6 +117,7 @@ export default Vue.extend({
 		},
 
 		origin() {
+			if (this.origin === 'local') this.searchHost = '';
 			this.users = [];
 			this.offset = 0;
 			this.fetchUsers();
@@ -157,6 +168,15 @@ export default Vue.extend({
 			this.target = '';
 		},
 
+		async showUserOnClick(userId: string) {
+			this.$root.api('admin/show-user', { userId: userId }).then(info => {
+				this.user = info;
+				this.$nextTick(() => {
+					this.$refs.user.scrollIntoView();
+				});
+			});
+		},
+
 		/** 処理対象ユーザーの情報を更新する */
 		async refreshUser() {
 			this.$root.api('admin/show-user', { userId: this.user.id }).then(info => {
@@ -308,13 +328,16 @@ export default Vue.extend({
 			return !confirm.canceled;
 		},
 
-		fetchUsers() {
+		fetchUsers(truncate?: boolean) {
+			if (truncate) this.offset = 0;
 			this.$root.api('admin/show-users', {
 				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
-				limit: this.limit + 1
+				limit: this.limit + 1,
+				username: this.searchUsername,
+				hostname: this.searchHost
 			}).then(users => {
 				if (users.length == this.limit + 1) {
 					users.pop();
@@ -322,7 +345,7 @@ export default Vue.extend({
 				} else {
 					this.existMore = false;
 				}
-				this.users = this.users.concat(users);
+				this.users = truncate ? users : this.users.concat(users);
 				this.offset += this.limit;
 			});
 		}

src/client/app/common/scripts/collect-page-vars.ts

@@ -32,6 +32,12 @@ export function collectPageVars(content) {
 					type: 'number',
 					value: 0
 				});
+			} else if (x.type === 'radioButton') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
 			} else if (x.children) {
 				collect(x.children);
 			}

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

@@ -4,7 +4,8 @@ const faces = [
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
 	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
-	'(Δ・x・Δ)'
+	'(Δ・x・Δ)',
+	'(ｺ｀・ﾍ・´ｹ)'
 ];
 
 export default () => faces[Math.floor(Math.random() * faces.length)];

src/client/app/common/views/components/mention.vue

@@ -1,11 +1,17 @@
 <template>
-<router-link class="ldlomzub" :to="`/${ canonical }`" v-user-preview="canonical">
+<router-link class="ldlomzub" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
 	<span class="me" v-if="isMe">{{ $t('@.you') }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </router-link>
+<a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
+	<span class="main">
+		<span class="username">@{{ username }}</span>
+		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }">@{{ toUnicode(host) }}</span>
+	</span>
+</a>
 </template>
 
 <script lang="ts">
@@ -32,6 +38,15 @@ export default Vue.extend({
 		};
 	},
 	computed: {
+		url(): string {
+			switch (this.host) {
+				case 'twitter.com':
+				case 'github.com':
+					return `https://${this.host}/${this.username}`;
+				default:
+					return `/${this.canonical}`;
+			}
+		},
 		canonical(): string {
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},

src/client/app/common/views/components/misskey-flavored-markdown.vue

@@ -30,6 +30,7 @@ export default Vue.extend({
 		border-radius 4px
 
 	>>> .quote
+		display block
 		margin 8px
 		padding 6px 0 6px 12px
 		color var(--mfmQuote)

src/client/app/common/views/components/page/page.block.vue

@@ -16,10 +16,11 @@ import XIf from './page.if.vue';
 import XTextarea from './page.textarea.vue';
 import XPost from './page.post.vue';
 import XCounter from './page.counter.vue';
+import XRadioButton from './page.radio-button.vue';
 
 export default Vue.extend({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton
 	},
 
 	props: {

src/client/app/common/views/components/page/page.radio-button.vue

@@ -0,0 +1,37 @@
+<template>
+<div>
+	<div>{{ script.interpolate(value.title) }}</div>
+	<ui-radio v-for="x in value.values" v-model="v" :value="x" :key="x">{{ x }}</ui-radio>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/client/app/common/views/components/poll-editor.vue

@@ -26,13 +26,19 @@
 				<option value="after">{{ $t('after') }}</option>
 			</ui-select>
 			<section v-if="expiration === 'at'">
-				<ui-input v-model="atDate" type="date">{{ $t('deadline-date') }}</ui-input>
+				<ui-input v-model="atDate" type="date">
-				<ui-input v-model="atTime" type="time">{{ $t('deadline-time') }}</ui-input>
+					<template #title>{{ $t('deadline-date') }}</template>
+				</ui-input>
+				<ui-input v-model="atTime" type="time">
+					<template #title>{{ $t('deadline-time') }}</template>
+				</ui-input>
 			</section>
 			<section v-if="expiration === 'after'">
-				<ui-input v-model="after" type="number">{{ $t('interval') }}</ui-input>
+				<ui-input v-model="after" type="number">
+					<template #title>{{ $t('interval') }}</template>
+				</ui-input>
 				<ui-select v-model="unit">
-					<template #label>{{ $t('unit') }}</template>
+					<template #title>{{ $t('unit') }}</template>
 					<option value="second">{{ $t('second') }}</option>
 					<option value="minute">{{ $t('minute') }}</option>
 					<option value="hour">{{ $t('hour') }}</option>

src/client/app/common/views/components/reaction-picker.vue

@@ -276,6 +276,7 @@ export default Vue.extend({
 			font-size 14px
 			color var(--popupFg)
 			border-bottom solid var(--lineWidth) var(--faceDivider)
+			line-height 20px
 
 		> .buttons
 			padding 4px 4px 8px 4px

src/client/app/common/views/components/settings/app-type.vue

@@ -29,8 +29,25 @@ export default Vue.extend({
 	computed: {
 		appTypeForce: {
 			get() { return this.$store.state.device.appTypeForce; },
-			set(value) { this.$store.commit('device/set', { key: 'appTypeForce', value }); }
+			set(value) {
+				this.$store.commit('device/set', { key: 'appTypeForce', value });
+				this.reload();
+			}
 		},
 	},
+
+	methods: {
+		reload() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('@.reload-to-apply-the-setting'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (!canceled) {
+					location.reload();
+				}
+			});
+		},
+	}
 });
 </script>

src/client/app/common/views/components/settings/profile.vue

@@ -51,6 +51,26 @@
 				<template #desc v-if="bannerUploading">{{ $t('uploading') }}<mk-ellipsis/></template>
 			</ui-input>
 
+			<div class="fields">
+				<header>{{ $t('profile-metadata') }}</header>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName0">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue0">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName1">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue1">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName2">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue2">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName3">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue3">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+			</div>
+
 			<ui-button @click="save(true)"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</ui-form>
 	</section>
@@ -189,6 +209,17 @@ export default Vue.extend({
 		this.isLocked = this.$store.state.i.isLocked;
 		this.carefulBot = this.$store.state.i.carefulBot;
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
+
+		if (this.$store.state.i.fields) {
+			this.fieldName0 = this.$store.state.i.fields[0].name;
+			this.fieldValue0 = this.$store.state.i.fields[0].value;
+			this.fieldName1 = this.$store.state.i.fields[1].name;
+			this.fieldValue1 = this.$store.state.i.fields[1].value;
+			this.fieldName2 = this.$store.state.i.fields[2].name;
+			this.fieldValue2 = this.$store.state.i.fields[2].value;
+			this.fieldName3 = this.$store.state.i.fields[3].name;
+			this.fieldValue3 = this.$store.state.i.fields[3].value;
+		}
 	},
 
 	methods: {
@@ -237,6 +268,13 @@ export default Vue.extend({
 		},
 
 		save(notify) {
+			const fields = [
+				{ name: this.fieldName0, value: this.fieldValue0 },
+				{ name: this.fieldName1, value: this.fieldValue1 },
+				{ name: this.fieldName2, value: this.fieldValue2 },
+				{ name: this.fieldName3, value: this.fieldValue3 },
+			];
+
 			this.saving = true;
 
 			this.$root.api('i/update', {
@@ -247,6 +285,7 @@ export default Vue.extend({
 				birthday: this.birthday || null,
 				avatarId: this.avatarId || undefined,
 				bannerId: this.bannerId || undefined,
+				fields,
 				isCat: !!this.isCat,
 				isBot: !!this.isBot,
 				isLocked: !!this.isLocked,
@@ -265,6 +304,29 @@ export default Vue.extend({
 						text: this.$t('saved')
 					});
 				}
+			}).catch(err => {
+				this.saving = false;
+				switch(err.id) {
+					case 'f419f9f8-2f4d-46b1-9fb4-49d3a2fd7191':
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('unable-to-process'),
+							text: this.$t('avatar-not-an-image')
+						});
+						break;
+					case '75aedb19-2afd-4e6d-87fc-67941256fa60':
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('unable-to-process'),
+							text: this.$t('banner-not-an-image')
+						});
+						break;
+					default:
+						this.$root.dialog({
+							type: 'error',
+							text: this.$t('unable-to-process')
+						});
+				}
 			});
 		},
 
@@ -366,4 +428,11 @@ export default Vue.extend({
 			height 72px
 			margin auto
 
+.fields
+	> header
+		padding 8px 0px
+		font-weight bold
+	> div
+		padding-left 16px
+
 </style>

src/client/app/common/views/components/settings/settings.vue

@@ -143,13 +143,17 @@
 				<ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}
 					<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template>
 				</ui-input>
+				<ui-button @click="save('webSearchEngine', webSearchEngine)"><fa :icon="faSave"/> {{ $t('@._settings.save') }}</ui-button>
 			</section>
 
 			<section v-if="!$root.isMobile">
 				<header>{{ $t('@._settings.paste') }}</header>
 				<ui-input v-model="pastedFileName">{{ $t('@._settings.pasted-file-name') }}
-					<template #desc>{{ $t('@._settings.pasted-file-name-desc') }}</template>
+					<template v-if="pastedFileName === this.$store.state.settings.pastedFileName" #desc>{{ $t('@._settings.pasted-file-name-desc') }}</template>
+					<template v-else #desc>{{ pastedFileNamePreview() }}</template>
 				</ui-input>
+				<ui-button @click="save('pastedFileName', pastedFileName)"><fa :icon="faSave"/> {{ $t('@._settings.save') }}</ui-button>
+
 				<ui-switch v-model="pasteDialog">{{ $t('@._settings.paste-dialog') }}
 					<template #desc>{{ $t('@._settings.paste-dialog-desc') }}</template>
 				</ui-switch>
@@ -289,6 +293,8 @@ import XNotification from './notification.vue';
 
 import { url, version } from '../../../../config';
 import checkForUpdate from '../../../scripts/check-for-update';
+import { formatTimeString } from '../../../../../../misc/format-time-string';
+import { faSave } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n(),
@@ -319,8 +325,11 @@ export default Vue.extend({
 		return {
 			meta: null,
 			version,
+			webSearchEngine: this.$store.state.settings.webSearchEngine,
+			pastedFileName : this.$store.state.settings.pastedFileName,
 			latestVersion: undefined,
-			checkingForUpdate: false
+			checkingForUpdate: false,
+			faSave
 		};
 	},
 	computed: {
@@ -419,16 +428,6 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'defaultNoteVisibility', value }); }
 		},
 
-		webSearchEngine: {
-			get() { return this.$store.state.settings.webSearchEngine; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); }
-		},
-
-		pastedFileName: {
-			get() { return this.$store.state.settings.pastedFileName; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'pastedFileName', value }); }
-		},
-
 		pasteDialog: {
 			get() { return this.$store.state.settings.pasteDialog; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'pasteDialog', value }); }
@@ -565,6 +564,17 @@ export default Vue.extend({
 				}
 			});
 		},
+		save(key, value) {
+			this.$store.dispatch('settings/set', {
+				key,
+				value
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('@._settings.saved')
+				})
+			});
+		},
 		customizeHome() {
 			location.href = '/?customize';
 		},
@@ -600,7 +610,10 @@ export default Vue.extend({
 			const sound = new Audio(`${url}/assets/message.mp3`);
 			sound.volume = this.$store.state.device.soundVolume;
 			sound.play();
-		}
+		},
+		pastedFileNamePreview() {
+			return `${formatTimeString(new Date(), this.pastedFileName).replace(/{{number}}/g, `1`)}.png`
+		},
 	}
 });
 </script>

src/client/app/common/views/components/signup.vue

@@ -43,7 +43,7 @@
 			</i18n>
 		</ui-switch>
 		<div v-if="meta.enableRecaptcha" class="g-recaptcha" :data-sitekey="meta.recaptchaSiteKey" style="margin: 16px 0;"></div>
-		<ui-button type="submit" :disabled="!(meta.ToSUrl ? ToSAgreement : true) || passwordRetypeState == 'not-match'">{{ $t('create') }}</ui-button>
+		<ui-button type="submit" :disabled=" submitting || !(meta.ToSUrl ? ToSAgreement : true) || passwordRetypeState == 'not-match'">{{ $t('create') }}</ui-button>
 	</template>
 </form>
 </template>
@@ -70,6 +70,7 @@ export default Vue.extend({
 			passwordStrength: '',
 			passwordRetypeState: null,
 			meta: {},
+			submitting: false,
 			ToSAgreement: false
 		}
 	},
@@ -145,6 +146,9 @@ export default Vue.extend({
 		},
 
 		onSubmit() {
+			if (this.submitting) return;
+			this.submitting = true;
+
 			this.$root.api('signup', {
 				username: this.username,
 				password: this.password,
@@ -159,6 +163,8 @@ export default Vue.extend({
 					location.href = '/';
 				});
 			}).catch(() => {
+				this.submitting = false;
+
 				this.$root.dialog({
 					type: 'error',
 					text: this.$t('some-error')

src/client/app/common/views/components/url-preview.vue

@@ -66,6 +66,7 @@ export default Vue.extend({
 			(this.url.substr(local.length) === '/') ||
 			this.url.substr(local.length).startsWith('/@') ||
 			this.url.substr(local.length).startsWith('/notes/') ||
+			this.url.substr(local.length).startsWith('/tags/') ||
 			this.url.substr(local.length).startsWith('/pages/');
 		return {
 			local,

src/client/app/common/views/components/url.vue

@@ -28,6 +28,7 @@ export default Vue.extend({
 			(this.url.substr(local.length) === '/') ||
 			this.url.substr(local.length).startsWith('/@') ||
 			this.url.substr(local.length).startsWith('/notes/') ||
+			this.url.substr(local.length).startsWith('/tags/') ||
 			this.url.substr(local.length).startsWith('/pages/'));
 		return {
 			local,

src/client/app/common/views/pages/page-editor/els/page-editor.el.radio-button.vue

@@ -0,0 +1,53 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.radioButton') }}</template>
+
+	<section style="padding: 0 16px 16px 16px;">
+		<ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._radioButton.name') }}</span></ui-input>
+		<ui-input v-model="value.title"><span>{{ $t('blocks._radioButton.title') }}</span></ui-input>
+		<ui-textarea v-model="values"><span>{{ $t('blocks._radioButton.values') }}</span></ui-textarea>
+		<ui-input v-model="value.default"><span>{{ $t('blocks._radioButton.default') }}</span></ui-input>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			values: '',
+			faBolt, faMagic
+		};
+	},
+
+	watch: {
+		values() {
+			Vue.set(this.value, 'values', this.values.split('\n'));
+		}
+	},
+
+	created() {
+		if (this.value.name == null) Vue.set(this.value, 'name', '');
+		if (this.value.title == null) Vue.set(this.value, 'title', '');
+		if (this.value.values == null) Vue.set(this.value, 'values', []);
+		this.values = this.value.values.join('\n');
+	},
+});
+</script>

src/client/app/common/views/pages/page-editor/page-editor.blocks.vue

@@ -19,10 +19,11 @@ import XSwitch from './els/page-editor.el.switch.vue';
 import XIf from './els/page-editor.el.if.vue';
 import XPost from './els/page-editor.el.post.vue';
 import XCounter from './els/page-editor.el.counter.vue';
+import XRadioButton from './els/page-editor.el.radio-button.vue';
 
 export default Vue.extend({
 	components: {
-		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter
+		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter, XRadioButton
 	},
 
 	props: {

src/client/app/common/views/pages/page-editor/page-editor.vue

@@ -342,6 +342,7 @@ export default Vue.extend({
 				label: this.$t('input-blocks'),
 				items: [
 					{ value: 'button', text: this.$t('blocks.button') },
+					{ value: 'radioButton', text: this.$t('blocks.radioButton') },
 					{ value: 'textInput', text: this.$t('blocks.textInput') },
 					{ value: 'textareaInput', text: this.$t('blocks.textareaInput') },
 					{ value: 'numberInput', text: this.$t('blocks.numberInput') },

src/client/app/desktop/api/update-avatar.ts

@@ -83,6 +83,21 @@ export default ($root: any) => {
 			});
 
 			return i;
+		}).catch(err => {
+			switch (err.id) {
+				case 'f419f9f8-2f4d-46b1-9fb4-49d3a2fd7191':
+					$root.dialog({
+						type: 'error',
+						title: locale['desktop']['unable-to-process'],
+						text: locale['desktop']['invalid-filetype']
+					});
+					break;
+				default:
+					$root.dialog({
+						type: 'error',
+						text: locale['desktop']['unable-to-process']
+					});
+			}
 		});
 	};
 

src/client/app/desktop/api/update-banner.ts

@@ -83,6 +83,21 @@ export default ($root: any) => {
 			});
 
 			return i;
+		}).catch(err => {
+			switch (err.id) {
+				case '75aedb19-2afd-4e6d-87fc-67941256fa60':
+					$root.dialog({
+						type: 'error',
+						title: locale['desktop']['unable-to-process'],
+						text: locale['desktop']['invalid-filetype']
+					});
+					break;
+				default:
+					$root.dialog({
+						type: 'error',
+						text: locale['desktop']['unable-to-process']
+					});
+			}
 		});
 	};
 

src/client/app/desktop/views/components/drive.vue

@@ -22,19 +22,19 @@
 	>
 		<div class="selection" ref="selection"></div>
 		<div class="contents" ref="contents">
-			<div class="folders" ref="foldersContainer" v-if="folders.length > 0">
+			<div class="folders" ref="foldersContainer" v-if="folders.length > 0 || moreFolders">
 				<x-folder v-for="folder in folders" :key="folder.id" class="folder" :folder="folder"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
 				<ui-button v-if="moreFolders">{{ $t('@.load-more') }}</ui-button>
 			</div>
-			<div class="files" ref="filesContainer" v-if="files.length > 0">
+			<div class="files" ref="filesContainer" v-if="files.length > 0 || moreFiles">
 				<x-file v-for="file in files" :key="file.id" class="file" :file="file"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
 				<ui-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('@.load-more') }}</ui-button>
 			</div>
-			<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
+			<div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching">
 				<p v-if="draghover">{{ $t('empty-draghover') }}</p>
 				<p v-if="!draghover && folder == null"><strong>{{ $t('empty-drive') }}</strong><br/>{{ $t('empty-drive-description') }}</p>
 				<p v-if="!draghover && folder != null">{{ $t('empty-folder') }}</p>

src/client/app/mobile/views/components/drive.vue

@@ -25,17 +25,17 @@
 				<template v-if="folder.filesCount > 0">{{ folder.filesCount }} {{ $t('file-count') }}</template>
 			</p>
 		</div>
-		<div class="folders" v-if="folders.length > 0">
+		<div class="folders" v-if="folders.length > 0 || moreFolders">
 			<x-folder class="folder" v-for="folder in folders" :key="folder.id" :folder="folder"/>
 			<p v-if="moreFolders">{{ $t('@.load-more') }}</p>
 		</div>
-		<div class="files" v-if="files.length > 0">
+		<div class="files" v-if="files.length > 0 || moreFiles">
 			<x-file class="file" v-for="file in files" :key="file.id" :file="file"/>
 			<button class="more" v-if="moreFiles" @click="fetchMoreFiles">
 				{{ fetchingMoreFiles ? this.$t('@.loading') : this.$t('@.load-more') }}
 			</button>
 		</div>
-		<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
+		<div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching">
 			<p v-if="folder == null">{{ $t('nothing-in-drive') }}</p>
 			<p v-if="folder != null">{{ $t('folder-is-empty') }}</p>
 		</div>

src/db/postgre.ts

@@ -47,6 +47,7 @@ import { UserSecurityKey } from '../models/entities/user-security-key';
 import { AttestationChallenge } from '../models/entities/attestation-challenge';
 import { Page } from '../models/entities/page';
 import { PageLike } from '../models/entities/page-like';
+import { ModerationLog } from '../models/entities/moderation-log';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 
@@ -124,6 +125,7 @@ export const entities = [
 	RegistrationTicket,
 	MessagingMessage,
 	Signin,
+	ModerationLog,
 	ReversiGame,
 	ReversiMatching,
 	...charts as any

src/models/entities/moderation-log.ts

@@ -0,0 +1,32 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { id } from '../id';
+
+@Entity()
+export class ModerationLog {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the ModerationLog.'
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column(id())
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Column('varchar', {
+		length: 128,
+	})
+	public type: string;
+
+	@Column('jsonb')
+	public info: Record<string, any>;
+}

src/models/index.ts

@@ -42,6 +42,7 @@ import { UserSecurityKey } from './entities/user-security-key';
 import { HashtagRepository } from './repositories/hashtag';
 import { PageRepository } from './repositories/page';
 import { PageLikeRepository } from './repositories/page-like';
+import { ModerationLogRepository } from './repositories/moderation-logs';
 
 export const Apps = getCustomRepository(AppRepository);
 export const Notes = getCustomRepository(NoteRepository);
@@ -86,3 +87,4 @@ export const ReversiMatchings = getCustomRepository(ReversiMatchingRepository);
 export const Logs = getRepository(Log);
 export const Pages = getCustomRepository(PageRepository);
 export const PageLikes = getCustomRepository(PageLikeRepository);
+export const ModerationLogs = getCustomRepository(ModerationLogRepository);

src/models/repositories/abuse-user-report.ts

@@ -14,6 +14,7 @@ export class AbuseUserReportRepository extends Repository<AbuseUserReport> {
 		return await awaitAll({
 			id: report.id,
 			createdAt: report.createdAt,
+			comment: report.comment,
 			reporterId: report.reporterId,
 			userId: report.userId,
 			reporter: Users.pack(report.reporter || report.reporterId, null, {

src/models/repositories/moderation-logs.ts

@@ -0,0 +1,31 @@
+import { EntityRepository, Repository } from 'typeorm';
+import { Users } from '..';
+import { ModerationLog } from '../entities/moderation-log';
+import { ensure } from '../../prelude/ensure';
+import { awaitAll } from '../../prelude/await-all';
+
+@EntityRepository(ModerationLog)
+export class ModerationLogRepository extends Repository<ModerationLog> {
+	public async pack(
+		src: ModerationLog['id'] | ModerationLog,
+	) {
+		const log = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
+
+		return await awaitAll({
+			id: log.id,
+			createdAt: log.createdAt,
+			type: log.type,
+			info: log.info,
+			userId: log.userId,
+			user: Users.pack(log.user || log.userId, null, {
+				detail: true
+			}),
+		});
+	}
+
+	public packMany(
+		reports: any[],
+	) {
+		return Promise.all(reports.map(x => this.pack(x)));
+	}
+}

src/models/repositories/user.ts

@@ -148,6 +148,7 @@ export class UserRepository extends Repository<User> {
 				description: profile!.description,
 				location: profile!.location,
 				birthday: profile!.birthday,
+				fields: profile!.fields,
 				followersCount: user.followersCount,
 				followingCount: user.followingCount,
 				notesCount: user.notesCount,

src/remote/activitypub/renderer/person.ts

@@ -21,13 +21,24 @@ export async function renderPerson(user: ILocalUser) {
 	]);
 
 	const attachment: {
-		type: string,
+		type: 'PropertyValue',
 		name: string,
 		value: string,
-		verified_at?: string,
 		identifier?: IIdentifier
 	}[] = [];
 
+	if (profile.fields) {
+		for (const field of profile.fields) {
+			attachment.push({
+				type: 'PropertyValue',
+				name: field.name,
+				value: (field.value != null && field.value.match(/^https?:/))
+					? `<a href="${new URL(field.value).href}" rel="me nofollow noopener" target="_blank">${new URL(field.value).href}</a>`
+					: field.value
+			});
+		}
+	}
+
 	if (profile.twitter) {
 		attachment.push({
 			type: 'PropertyValue',

src/server/api/common/signin.ts

@@ -2,6 +2,9 @@ import * as Koa from 'koa';
 
 import config from '../../../config';
 import { ILocalUser } from '../../../models/entities/user';
+import { Signins } from '../../../models';
+import { genId } from '../../../misc/gen-id';
+import { publishMainStream } from '../../../services/stream';
 
 export default function(ctx: Koa.BaseContext, user: ILocalUser, redirect = false) {
 	if (redirect) {
@@ -24,4 +27,19 @@ export default function(ctx: Koa.BaseContext, user: ILocalUser, redirect = false
 		ctx.body = { i: user.token };
 		ctx.status = 200;
 	}
+
+	(async () => {
+		// Append signin history
+		const record = await Signins.save({
+			id: genId(),
+			createdAt: new Date(),
+			userId: user.id,
+			ip: ctx.ip,
+			headers: ctx.headers,
+			success: true
+		});
+
+		// Publish signin event
+		publishMainStream(user.id, 'signin', await Signins.pack(record));
+	})();
 }

src/server/api/endpoints/admin/emoji/add.ts

@@ -4,6 +4,7 @@ import { detectUrlMine } from '../../../../../misc/detect-url-mine';
 import { Emojis } from '../../../../../models';
 import { genId } from '../../../../../misc/gen-id';
 import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
 
 export const meta = {
 	desc: {
@@ -31,7 +32,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const type = await detectUrlMine(ps.url);
 
 	const emoji = await Emojis.save({
@@ -46,6 +47,10 @@ export default define(meta, async (ps) => {
 
 	await getConnection().queryResultCache!.remove(['meta_emojis']);
 
+	insertModerationLog(me, 'addEmoji', {
+		emojiId: emoji.id
+	});
+
 	return {
 		id: emoji.id
 	};

src/server/api/endpoints/admin/emoji/remove.ts

@@ -3,6 +3,7 @@ import define from '../../../define';
 import { ID } from '../../../../../misc/cafy-id';
 import { Emojis } from '../../../../../models';
 import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
 
 export const meta = {
 	desc: {
@@ -21,7 +22,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const emoji = await Emojis.findOne(ps.id);
 
 	if (emoji == null) throw new Error('emoji not found');
@@ -29,4 +30,8 @@ export default define(meta, async (ps) => {
 	await Emojis.delete(emoji.id);
 
 	await getConnection().queryResultCache!.remove(['meta_emojis']);
+
+	insertModerationLog(me, 'removeEmoji', {
+		emoji: emoji
+	});
 });

src/server/api/endpoints/admin/queue/clear.ts

@@ -1,5 +1,6 @@
 import define from '../../../define';
 import { destroy } from '../../../../../queue';
+import { insertModerationLog } from '../../../../../services/insert-moderation-log';
 
 export const meta = {
 	tags: ['admin'],
@@ -10,8 +11,8 @@ export const meta = {
 	params: {}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	destroy();
 
-	return;
+	insertModerationLog(me, 'clearQueue');
 });

src/server/api/endpoints/admin/show-moderation-logs.ts

@@ -0,0 +1,35 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { ModerationLogs } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	}
+};
+
+export default define(meta, async (ps) => {
+	const query = makePaginationQuery(ModerationLogs.createQueryBuilder('report'), ps.sinceId, ps.untilId);
+
+	const reports = await query.take(ps.limit!).getMany();
+
+	return await ModerationLogs.packMany(reports);
+});

src/server/api/endpoints/admin/show-users.ts

@@ -49,6 +49,16 @@ export const meta = {
 				'remote',
 			]),
 			default: 'local'
+		},
+
+		username: {
+			validator: $.optional.str,
+			default: null
+		},
+
+		hostname: {
+			validator: $.optional.str,
+			default: null
 		}
 	}
 };
@@ -70,6 +80,14 @@ export default define(meta, async (ps, me) => {
 		case 'remote': query.andWhere('user.host IS NOT NULL'); break;
 	}
 
+	if (ps.username) {
+		query.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' });
+	}
+
+	if (ps.hostname) {
+		query.andWhere('user.host like :hostname', { hostname: '%' + ps.hostname.toLowerCase() + '%' });
+	}
+
 	switch (ps.sort) {
 		case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
 		case '-follower': query.orderBy('user.followersCount', 'ASC'); break;

src/server/api/endpoints/admin/silence-user.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
 
 export const meta = {
 	desc: {
@@ -25,7 +26,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId as string);
 
 	if (user == null) {
@@ -39,4 +40,8 @@ export default define(meta, async (ps) => {
 	await Users.update(user.id, {
 		isSilenced: true
 	});
+
+	insertModerationLog(me, 'silence', {
+		targetId: user.id,
+	});
 });

src/server/api/endpoints/admin/suspend-user.ts

@@ -4,6 +4,8 @@ import define from '../../define';
 import deleteFollowing from '../../../../services/following/delete';
 import { Users, Followings } from '../../../../models';
 import { User } from '../../../../models/entities/user';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
+import { doPostSuspend } from '../../../../services/suspend-user';
 
 export const meta = {
 	desc: {
@@ -27,7 +29,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId as string);
 
 	if (user == null) {
@@ -46,7 +48,14 @@ export default define(meta, async (ps) => {
 		isSuspended: true
 	});
 
-	unFollowAll(user);
+	insertModerationLog(me, 'suspend', {
+		targetId: user.id,
+	});
+
+	(async () => {
+		await doPostSuspend(user).catch(e => {});
+		await unFollowAll(user).catch(e => {});
+	})();
 });
 
 async function unFollowAll(follower: User) {

src/server/api/endpoints/admin/unsilence-user.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
 
 export const meta = {
 	desc: {
@@ -25,7 +26,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId as string);
 
 	if (user == null) {
@@ -35,4 +36,8 @@ export default define(meta, async (ps) => {
 	await Users.update(user.id, {
 		isSilenced: false
 	});
+
+	insertModerationLog(me, 'unsilence', {
+		targetId: user.id,
+	});
 });

src/server/api/endpoints/admin/unsuspend-user.ts

@@ -2,6 +2,8 @@ import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { Users } from '../../../../models';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
+import { doPostUnsuspend } from '../../../../services/unsuspend-user';
 
 export const meta = {
 	desc: {
@@ -25,7 +27,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId as string);
 
 	if (user == null) {
@@ -35,4 +37,10 @@ export default define(meta, async (ps) => {
 	await Users.update(user.id, {
 		isSuspended: false
 	});
+
+	insertModerationLog(me, 'unsuspend', {
+		targetId: user.id,
+	});
+
+	doPostUnsuspend(user);
 });

src/server/api/endpoints/admin/update-meta.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import define from '../../define';
 import { getConnection } from 'typeorm';
 import { Meta } from '../../../../models/entities/meta';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
 
 export const meta = {
 	desc: {
@@ -401,7 +402,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const set = {} as Partial<Meta>;
 
 	if (ps.announcements) {
@@ -653,4 +654,6 @@ export default define(meta, async (ps) => {
 			await transactionalEntityManager.save(Meta, set);
 		}
 	});
+
+	insertModerationLog(me, 'updateMeta');
 });

src/server/api/endpoints/admin/vacuum.ts

@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../define';
 import { getConnection } from 'typeorm';
+import { insertModerationLog } from '../../../../services/insert-moderation-log';
 
 export const meta = {
 	tags: ['admin'],
@@ -18,7 +19,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, async (ps) => {
+export default define(meta, async (ps, me) => {
 	const params: string[] = [];
 
 	if (ps.full) {
@@ -30,4 +31,6 @@ export default define(meta, async (ps) => {
 	}
 
 	getConnection().query('VACUUM ' + params.join(' '));
+
+	insertModerationLog(me, 'vacuum', ps);
 });

src/server/api/endpoints/federation/instances.ts

@@ -43,12 +43,12 @@ export default define(meta, async (ps, me) => {
 	switch (ps.sort) {
 		case '+notes': query.orderBy('instance.notesCount', 'DESC'); break;
 		case '-notes': query.orderBy('instance.notesCount', 'ASC'); break;
-		case '+usersCount': query.orderBy('instance.usersCount', 'DESC'); break;
+		case '+users': query.orderBy('instance.usersCount', 'DESC'); break;
-		case '-usersCount': query.orderBy('instance.usersCount', 'ASC'); break;
+		case '-users': query.orderBy('instance.usersCount', 'ASC'); break;
-		case '+followingCount': query.orderBy('instance.followingCount', 'DESC'); break;
+		case '+following': query.orderBy('instance.followingCount', 'DESC'); break;
-		case '-followingCount': query.orderBy('instance.followingCount', 'ASC'); break;
+		case '-following': query.orderBy('instance.followingCount', 'ASC'); break;
-		case '+followersCount': query.orderBy('instance.followersCount', 'DESC'); break;
+		case '+followers': query.orderBy('instance.followersCount', 'DESC'); break;
-		case '-followersCount': query.orderBy('instance.followersCount', 'ASC'); break;
+		case '-followers': query.orderBy('instance.followersCount', 'ASC'); break;
 		case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break;
 		case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break;
 		case '+lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'DESC'); break;

src/server/api/endpoints/hashtags/users.ts

@@ -59,7 +59,7 @@ export const meta = {
 
 export default define(meta, async (ps, me) => {
 	const query = Users.createQueryBuilder('user')
-		.where(':tag = ANY(user.tags)', { tag: ps.tag });
+		.where(':tag = ANY(user.tags)', { tag: ps.tag.toLowerCase() });
 
 	const recent = new Date(Date.now() - (1000 * 60 * 60 * 24 * 5));
 

src/server/api/endpoints/i/delete-account.ts

@@ -3,6 +3,7 @@ import * as bcrypt from 'bcryptjs';
 import define from '../../define';
 import { Users, UserProfiles } from '../../../../models';
 import { ensure } from '../../../../prelude/ensure';
+import { doPostSuspend } from '../../../../services/suspend-user';
 
 export const meta = {
 	requireCredential: true,
@@ -26,5 +27,8 @@ export default define(meta, async (ps, user) => {
 		throw new Error('incorrect password');
 	}
 
+	// 物理削除する前にDelete activityを送信する
+	await doPostSuspend(user).catch(e => {});
+
 	await Users.delete(user.id);
 });

src/server/api/endpoints/i/update.ts

@@ -77,6 +77,13 @@ export const meta = {
 			}
 		},
 
+		fields: {
+			validator: $.optional.arr($.object()).range(1, 4),
+			desc: {
+				'ja-JP': 'プロフィール補足情報'
+			}
+		},
+
 		isLocked: {
 			validator: $.optional.bool,
 			desc: {
@@ -226,6 +233,14 @@ export default define(meta, async (ps, user, app) => {
 		profileUpdates.pinnedPageId = null;
 	}
 
+	if (ps.fields) {
+		profileUpdates.fields = ps.fields
+			.filter(x => typeof x.name === 'string' && x.name !== '' && typeof x.value === 'string' && x.value !== '')
+			.map(x => {
+				return { name: x.name, value: x.value };
+			});
+	}
+
 	//#region emojis/tags
 
 	let emojis = [] as string[];

src/server/api/private/signin.ts

@@ -1,7 +1,6 @@
 import * as Koa from 'koa';
 import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
-import { publishMainStream } from '../../../services/stream';
 import signin from '../common/signin';
 import config from '../../../config';
 import { Users, Signins, UserProfiles, UserSecurityKeys, AttestationChallenges } from '../../../models';
@@ -55,33 +54,29 @@ export default async (ctx: Koa.BaseContext) => {
 
 	async function fail(status?: number, failure?: { error: string }) {
 		// Append signin history
-		const record = await Signins.save({
+		await Signins.save({
 			id: genId(),
 			createdAt: new Date(),
 			userId: user.id,
 			ip: ctx.ip,
 			headers: ctx.headers,
-			success: !!(status || failure)
+			success: false
 		});
 
-		// Publish signin event
+		ctx.throw(status || 500, failure || { error: 'someting happened' });
-		publishMainStream(user.id, 'signin', await Signins.pack(record));
-
-		if (status && failure) {
-			ctx.throw(status, failure);
-		}
 	}
 
 	if (!profile.twoFactorEnabled) {
 		if (same) {
 			signin(ctx, user);
+			return;
 		} else {
 			await fail(403, {
 				error: 'incorrect password'
 			});
-		}
 			return;
 		}
+	}
 
 	if (token) {
 		if (!same) {
@@ -169,6 +164,7 @@ export default async (ctx: Koa.BaseContext) => {
 
 		if (isValid) {
 			signin(ctx, user);
+			return;
 		} else {
 			await fail(403, {
 				error: 'invalid challenge data'
@@ -191,6 +187,7 @@ export default async (ctx: Koa.BaseContext) => {
 			await fail(403, {
 				error: 'no keys found'
 			});
+			return;
 		}
 
 		// 32 byte challenge
@@ -219,6 +216,5 @@ export default async (ctx: Koa.BaseContext) => {
 		ctx.status = 200;
 		return;
 	}
-
+	// never get here
-	await fail();
 };

src/server/api/private/signup.ts

@@ -5,7 +5,7 @@ import generateUserToken from '../common/generate-native-user-token';
 import config from '../../../config';
 import { fetchMeta } from '../../../misc/fetch-meta';
 import * as recaptcha from 'recaptcha-promise';
-import { Users, RegistrationTickets } from '../../../models';
+import { Users, Signins, RegistrationTickets } from '../../../models';
 import { genId } from '../../../misc/gen-id';
 import { usersChart } from '../../../services/chart';
 import { User } from '../../../models/entities/user';
@@ -104,6 +104,13 @@ export default async (ctx: Koa.BaseContext) => {
 
 	// Start transaction
 	await getConnection().transaction(async transactionalEntityManager => {
+		const exist = await transactionalEntityManager.findOne(User, {
+			usernameLower: username.toLowerCase(),
+			host: null
+		});
+
+		if (exist) throw 'already registered';
+
 		account = await transactionalEntityManager.save(new User({
 			id: genId(),
 			createdAt: new Date(),
@@ -130,6 +137,16 @@ export default async (ctx: Koa.BaseContext) => {
 
 	usersChart.update(account, true);
 
+	// Append signin history
+	await Signins.save({
+		id: genId(),
+		createdAt: new Date(),
+		userId: account.id,
+		ip: ctx.ip,
+		headers: ctx.headers,
+		success: true
+	});
+
 	const res = await Users.pack(account, account, {
 		detail: true,
 		includeSecrets: true

src/server/proxy/proxy-media.ts

@@ -33,7 +33,7 @@ export async function proxyMedia(ctx: Koa.BaseContext) {
 			};
 		}
 
-		ctx.set('Content-Type', type);
+		ctx.set('Content-Type', image.type);
 		ctx.set('Cache-Control', 'max-age=31536000, immutable');
 		ctx.body = image.data;
 	} catch (e) {

src/server/web/index.ts

@@ -156,11 +156,17 @@ router.get('/@:user', async (ctx, next) => {
 	if (user != null) {
 		const profile = await UserProfiles.findOne(user.id).then(ensure);
 		const meta = await fetchMeta();
+		const me = profile.fields
+			? profile.fields
+				.filter(filed => filed.value != null && filed.value.match(/^https?:/))
+				.map(field => field.value)
+			: [];
+
 		await ctx.render('user', {
-			user, profile,
+			user, profile, me,
 			instanceName: meta.name || 'Misskey'
 		});
-		ctx.set('Cache-Control', 'public, max-age=180');
+		ctx.set('Cache-Control', 'public, max-age=30');
 	} else {
 		// リモートユーザーなので
 		await next();

src/server/web/views/base.pug

@@ -44,3 +44,4 @@ html
 			<svg viewBox="0 0 50 50">
 				<path fill=#fb4e4e d="M25.251,6.461c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615V6.461z" />
 			</svg>
+		block content

src/server/web/views/user.pug

@@ -36,3 +36,8 @@ block meta
 		link(rel='alternate' href=user.uri type='application/activity+json')
 	if profile.url
 		link(rel='alternate' href=profile.url type='text/html')
+
+block content
+	div#me
+		each m in me
+			a(rel='me' href=`${m}`) #{m}

src/services/insert-moderation-log.ts

@@ -0,0 +1,13 @@
+import { ILocalUser } from '../models/entities/user';
+import { ModerationLogs } from '../models';
+import { genId } from '../misc/gen-id';
+
+export async function insertModerationLog(moderator: ILocalUser, type: string, info?: Record<string, any>) {
+	await ModerationLogs.save({
+		id: genId(),
+		createdAt: new Date(),
+		userId: moderator.id,
+		type: type,
+		info: info || {}
+	});
+}

src/services/suspend-user.ts

@@ -0,0 +1,34 @@
+import renderDelete from '../remote/activitypub/renderer/delete';
+import { renderActivity } from '../remote/activitypub/renderer';
+import { deliver } from '../queue';
+import config from '../config';
+import { User } from '../models/entities/user';
+import { Users, Followings } from '../models';
+import { Not, IsNull } from 'typeorm';
+
+export async function doPostSuspend(user: User) {
+	if (Users.isLocalUser(user)) {
+		// 知り得る全SharedInboxにDelete配信
+		const content = renderActivity(renderDelete(`${config.url}/users/${user.id}`, user));
+
+		const queue: string[] = [];
+
+		const followings = await Followings.find({
+			where: [
+				{ followerSharedInbox: Not(IsNull()) },
+				{ followeeSharedInbox: Not(IsNull()) }
+			],
+			select: ['followerSharedInbox', 'followeeSharedInbox']
+		});
+
+		const inboxes = followings.map(x => x.followerSharedInbox || x.followeeSharedInbox);
+
+		for (const inbox of inboxes) {
+			if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+		}
+
+		for (const inbox of queue) {
+			deliver(user as any, content, inbox);
+		}
+	}
+}

src/services/unsuspend-user.ts

@@ -0,0 +1,35 @@
+import renderDelete from '../remote/activitypub/renderer/delete';
+import renderUndo from '../remote/activitypub/renderer/undo';
+import { renderActivity } from '../remote/activitypub/renderer';
+import { deliver } from '../queue';
+import config from '../config';
+import { User } from '../models/entities/user';
+import { Users, Followings } from '../models';
+import { Not, IsNull } from 'typeorm';
+
+export async function doPostUnsuspend(user: User) {
+	if (Users.isLocalUser(user)) {
+		// 知り得る全SharedInboxにUndo Delete配信
+		const content = renderActivity(renderUndo(renderDelete(`${config.url}/users/${user.id}`, user), user));
+
+		const queue: string[] = [];
+
+		const followings = await Followings.find({
+			where: [
+				{ followerSharedInbox: Not(IsNull()) },
+				{ followeeSharedInbox: Not(IsNull()) }
+			],
+			select: ['followerSharedInbox', 'followeeSharedInbox']
+		});
+
+		const inboxes = followings.map(x => x.followerSharedInbox || x.followeeSharedInbox);
+
+		for (const inbox of inboxes) {
+			if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+		}
+
+		for (const inbox of queue) {
+			deliver(user as any, content, inbox);
+		}
+	}
+}