12.35.2

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

.config/example.yml

@@ -142,6 +142,11 @@ id: 'aid'
 # Proxy for HTTP/HTTPS
 #proxy: http://127.0.0.1:3128
 
+#proxyBypassHosts: [
+#  'example.com',
+#  '192.0.2.8'
+#]
+
 # Proxy for SMTP/SMTPS
 #proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
 #proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4

CHANGELOG.md

@@ -1,6 +1,91 @@
 ChangeLog
 =========
 
+12.35.1 (2020/4/19)
+-------------------
+### 🐛Fixes
+* Pagesのチャート描画を調整
+
+12.35.0 (2020/4/19)
+-------------------
+### ✨Improvements
+* Pagesでチャートを描画できるように
+* Pagesでキャンバスの画像を投稿フォームで添付できるように
+* AiScriptのバージョンアップ
+
+### 🐛Fixes
+* タイムラインウィジェットの数が多ければ多いほど、リアクションが多く付いて見える問題を修正
+* カスタム絵文字リアクションがプレビューされない不具合を修正
+
+12.34.0 (2020/4/17)
+-------------------
+### ✨Improvements
+* Pagesでrectメソッドを追加
+* AiScriptのバージョンアップ
+
+12.33.0 (2020/4/16)
+-------------------
+### ✨Improvements
+* Pagesで円を書くメソッドを追加
+* AiScriptのバージョンアップ
+
+### 🐛Fixes
+* PagesでAiScript変数があると編集が機能しなくなる問題を修正
+
+12.32.0 (2020/4/16)
+-------------------
+### ✨Improvements
+* Pagesで画像を描画できるように
+* AiScriptのバージョンアップ
+* 0以下のリアクションは送らないように
+
+### 🐛Fixes
+* リアクションの修正
+* Fix Media List in CW Content
+
+12.31.0 (2020/4/14)
+-------------------
+### ✨Improvements
+* プロキシの除外ホスト指定とオブジェクトストレージへの適用を除外するオプション
+* AiScript
+* モデレーション関連機能
+* sensitiveではないメディアも非表示にできるように
+* 投稿のURLプレビューポップアップを改良
+* リモートのカスタム絵文字リアクションを表示できるように
+
+### 🐛Fixes
+* リアクションカウントがおかしくなることがあるのを修正
+
+12.30.0 (2020/4/11)
+-------------------
+### ✨Improvements
+* リクエストライブラリをrequestからnode-fetchに変更
+* オブジェクトストレージのhttpスキーマリクエストでもProxyが適用されるように
+* DNSキャッシュとKeep-Alive適用箇所を増やす
+* ドイツ語と中国語（繁体）を有効に
+* NSFWを再度隠せるように
+* Implement AiScript scratchpad (/scratchpad)
+
+### 🐛Fixes
+* APのurl処理の修正
+
+12.29.0 (2020/4/5)
+-------------------
+### ✨Improvements
+* トークン系の乱数ソースではcryptoを使うように
+* broadcast stream が追加され emojiAdded イベントをサポート
+* APIリファレンスの高速化等
+* Ability to set header image for a Page
+* ログの改善
+
+### 🐛Fixes
+* アプリ一覧に1回も使用していないアプリが表示されないのを修正
+* admin/accounts/createで一般ユーザーがアカウントを作成し放題なのを修正
+* 翻訳の未適用箇所を修正
+* APIの権限設定漏れを修正
+* インストール直後にアクティビティが飛んで来たりするともう初期管理者セットアップがができなくなるのを修正
+* リモート投稿でurlがあればそちらをリンクするように修正
+
 12.28.0 (2020/3/29)
 -------------------
 ### ✨Improvements

locales/de-DE.yml

@@ -41,8 +41,8 @@ addToList: "Zur Liste hinzufügen"
 sendMessage: "Nachricht senden"
 copyUsername: "Benutzernamen kopieren"
 reply: "Antworten"
-loadMore: "Zeige mehr"
-youGotNewFollower: "Sie haben einen neuen Follower"
+loadMore: "Mehr anzeigen"
+youGotNewFollower: "Du hast einen neuen Follower"
 receiveFollowRequest: "Follow-Anfrage erhalten."
 followRequestAccepted: "Follow-Anfrage akzeptiert"
 mentions: "Erwähnungen"
@@ -73,7 +73,7 @@ makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
 defaultNoteVisibility: "Standardsichtbarkeit"
 follow: "Folgen"
 followRequest: "Follow-Anfrage"
-followRequests: "Follower-Anfragen"
+followRequests: "Follow-Anfragen"
 unfollow: "Nicht mehr folgen"
 followRequestPending: "Ausstehende Follow-Anfrage"
 enterEmoji: "Gib ein Emoji ein"
@@ -265,6 +265,7 @@ watch: "Beobachten"
 unwatch: "Nicht mehr beobachten"
 accept: "Akzeptieren"
 reject: "Ablehnen"
+normal: "Normal"
 instanceName: "Name der Instanz"
 instanceDescription: "Beschreibung der Instanz"
 maintainerName: "Betreiber"
@@ -319,6 +320,7 @@ notesAndReplies: "Notizen und Antworten"
 withFiles: "Dateien beinhalten"
 silence: "Instanzweit stummschalten"
 silenceConfirm: "Möchtest du diesen Benutzer wirklich instanzweit stummschalten?"
+unsilence: "Instanzweite Stummschaltung aufheben"
 unsilenceConfirm: "Möchtest du die instanzweite Stummschaltung dieses Benutzers wirklich aufheben?"
 popularUsers: "Beliebte Benutzer"
 recentlyUpdatedUsers: "Vor kurzem aktive Benutzer"
@@ -331,7 +333,7 @@ userList: "Listen"
 about: "Über"
 aboutMisskey: "Über Misskey"
 aboutMisskeyText: "Misskey ist Open-Source-Software die von syuilo seit 2014 entwickelt wird."
-misskeyMembers: "Sie wird momentan von den unten aufgelisteten Mitgliedern weiterentwickelt und instand gehalten:"
+misskeyMembers: "Misskey wird momentan von den unten aufgelisteten Mitgliedern weiterentwickelt und instand gehalten:"
 misskeySource: "Der Quelltext ist hier verfügbar:"
 misskeyTranslation: "Hilf dabei, Misskey zu übersetzen:"
 misskeyDonate: "Spende an Misskey, um die Weiterentwicklung zu unterstützen:"
@@ -341,7 +343,7 @@ administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
 moderator: "Moderator"
-nUsersMentioned: "{n} Benutzer erwähnt"
+nUsersMentioned: "{n} Benutzer reden darüber"
 securityKey: "Sicherheitsschlüssel"
 securityKeyName: "Schlüsselname"
 registerSecurityKey: "Sicherheitsschlüssel registrieren"
@@ -350,10 +352,8 @@ unregister: "Deaktivieren"
 passwordLessLogin: "Passwortloses Anmelden einrichten"
 resetPassword: "Passwort zurücksetzen"
 newPasswordIs: "Das neue Passwort ist \"{password}\""
-post: "Beitrag"
-posted: "Gesendet"
 autoReloadWhenDisconnected: "Automatisch aktualisieren wenn die Serververbindung getrennt wird"
-autoNoteWatch: "Notiz automatisch beobachten"
+autoNoteWatch: "Notizen automatisch beobachten"
 autoNoteWatchDescription: "Werde über Notizen, auf die du reagiert oder geantwortet hast, informiert"
 reduceUiAnimation: "Animationen der Benutzeroberfläche reduzieren"
 share: "Teilen"
@@ -372,7 +372,7 @@ groups: "Gruppen"
 createGroup: "Gruppe erstellen"
 ownedGroups: "Eigene Gruppen"
 joinedGroups: "Beigetretene Gruppen"
-invites: "Einladen"
+invites: "Einladungen"
 groupName: "Gruppenname"
 members: "Mitglieder"
 transfer: "Übertragen"
@@ -454,10 +454,12 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "Gib eine Region (wie z.B. \"xx-east-1\") an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib \"us-east-1\" an."
 objectStorageUseSSL: "SSL verwenden"
 objectStorageUseSSLDesc: "Deaktiviere dies falls du für die API-Verbindungen kein HTTPS verwenden wirst"
+objectStorageUseProxy: "Über Proxy verbinden"
+objectStorageUseProxyDesc: "Deaktiviere dies falls du keinen Proxy für den Objektspeicher verwenden wirst"
 serverLogs: "Serverprotokolle"
 deleteAll: "Alle löschen"
 showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen"
-newNoteRecived: "Du hast eine neue Notiz empfangen"
+newNoteRecived: "Es gibt neue Notizen"
 sounds: "Töne"
 listen: "Anhören"
 none: "Keine"
@@ -476,6 +478,18 @@ state: "Status"
 sort: "Sortieren"
 ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
+scratchpad: "Testumgebung"
+scratchpadDescription: "Die Testumgebung bietet eine experimentale Umgebung für AiScript. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
+output: "Ausgabe"
+script: "Skript"
+disablePagesScript: "AiScript auf Seiten deaktivieren"
+updateRemoteUser: "Informationen über den Benutzer der fremder Instanz aktualisieren"
+deleteAllFiles: "Alle Dateien löschen"
+deleteAllFilesConfirm: "Möchtest du wirklich alle Dateien löschen?"
+removeAllFollowing: "Allen gefolgten Benutzern entfolgen"
+removeAllFollowingDescription: "Allen Benutzerkonten von {host} entfolgen. Bitte führe dies durch, falls diese Instanz nicht mehr existiert."
+userSuspended: "Dieser Benutzer wurde gesperrt."
+userSilenced: "Dieser Benutzer wurde instanzweit stummgeschaltet."
 _theme:
   explore: "Themen erforschen"
   install: "Thema installieren"
@@ -599,7 +613,7 @@ _widgets:
   photos: "Fotos"
 _cw:
   hide: "Ausblenden"
-  show: "Zeige mehr"
+  show: "Mehr anzeigen"
   chars: "{count} Zeichen"
   files: "{count} Dateien"
   poll: "Umfrage"
@@ -655,9 +669,9 @@ _profile:
   metadataContent: "Inhalt"
 _exportOrImport:
   allNotes: "Alle Notizen"
-  followingList: "Folgen"
-  muteList: "Stummschalten"
-  blockingList: "Blockieren"
+  followingList: "Gefolgte Benutzer"
+  muteList: "Stummschaltungen"
+  blockingList: "Blockierungen"
   userLists: "Listen"
 _charts:
   federationInstancesIncDec: "Unterschied in der Anzahl von förderierenden Instanzen"
@@ -739,6 +753,8 @@ _pages:
     post: "Neue Notiz anfertigen"
     _post:
       text: "Inhalt"
+      attachCanvasImage: "Leinwand als Bild anfügen"
+      canvasId: "Leinwand-ID"
     textInput: "Texteingabe"
     _textInput:
       name: "Variablenname"
@@ -754,6 +770,11 @@ _pages:
       name: "Variablenname"
       text: "Titel"
       default: "Standardwert"
+    canvas: "Leinwand"
+    _canvas:
+      id: "Leinwand-ID"
+      width: "Breite"
+      height: "Höhe"
     switch: "Fallunterscheidung"
     _switch:
       name: "Variablenname"
@@ -779,6 +800,9 @@ _pages:
           message: "Nachricht, die bei Aktivierung gezeigt werden soll"
           variable: "Variable, die gesendet werden soll"
           no-variable: "Keine"
+        callAiScript: "AiScript ausführen"
+        _callAiScript:
+          functionName: "Funktionsname"
     radioButton: "Optionsfeld"
     _radioButton:
       name: "Variablenname"
@@ -939,6 +963,7 @@ _pages:
       _splitStrByLine:
         arg1: "Text"
       ref: "Variablen"
+      aiScriptVar: "AiScript Variablen"
       fn: "Funktionen"
       _fn:
         slots: "Slots"

locales/en-US.yml

@@ -265,6 +265,7 @@ watch: "Watch"
 unwatch: "Undo Watch"
 accept: "Accept"
 reject: "Reject"
+normal: "Normal"
 instanceName: "Instance name"
 instanceDescription: "Instance description"
 maintainerName: "Maintainer"
@@ -319,6 +320,7 @@ notesAndReplies: "Notes and replies"
 withFiles: "Media"
 silence: "Silence"
 silenceConfirm: "Are you sure that you want to silence this user?"
+unsilence: "Unsilence"
 unsilenceConfirm: "Are you sure that you want to undo silence of this user?"
 popularUsers: "Trending users"
 recentlyUpdatedUsers: "Users with recent activity"
@@ -350,8 +352,6 @@ unregister: "Unregister"
 passwordLessLogin: "Set up password-less login"
 resetPassword: "Reset password"
 newPasswordIs: "The new password is \"{password}\""
-post: "Post"
-posted: "Posted!"
 autoReloadWhenDisconnected: "Auto refresh when disconnected from server"
 autoNoteWatch: "Watch note automatically"
 autoNoteWatchDescription: "Get notified about the notes which you reactioned or replied."
@@ -454,6 +454,8 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "Specify a region like 'xx-east-1'. If your service does not have distinction about regions, leave it blank or fill with 'us-east-1'."
 objectStorageUseSSL: "Use SSL"
 objectStorageUseSSLDesc: "Turn off this if you are not going to use HTTPS for API connection"
+objectStorageUseProxy: "Connect over Proxy"
+objectStorageUseProxyDesc: "Turn off this if you are not going to use Proxy for ObjectStorage connection"
 serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
@@ -476,6 +478,18 @@ state: "State"
 sort: "Sort"
 ascendingOrder: "Ascending"
 descendingOrder: "Descending"
+scratchpad: "Scratch pad"
+scratchpadDescription: "Scratchpad provides experimental environment for AiScript. You can write, execute, and check the results that interact with Misskey."
+output: "Output"
+script: "Script"
+disablePagesScript: "Disable AiScript on Pages"
+updateRemoteUser: "Update remote user information"
+deleteAllFiles: "Delete All Files"
+deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
+removeAllFollowing: "Withhold All Followings"
+removeAllFollowingDescription: "Unfollow all accounts from {host}. Please run this if the instance no longer exists."
+userSuspended: "This user has been suspended."
+userSilenced: "This user has been silenced."
 _theme:
   explore: "Explore Themes"
   install: "Install theme"
@@ -739,6 +753,8 @@ _pages:
     post: "Compose a note"
     _post:
       text: "Content"
+      attachCanvasImage: "Post with Canvas as Image"
+      canvasId: "Canvas ID"
     textInput: "Text input"
     _textInput:
       name: "Variable name"
@@ -754,6 +770,11 @@ _pages:
       name: "Variable name"
       text: "Title"
       default: "Default value"
+    canvas: "Canvas"
+    _canvas:
+      id: "Canvas ID"
+      width: "Width"
+      height: "Height"
     switch: "Switch"
     _switch:
       name: "Variable name"
@@ -779,6 +800,9 @@ _pages:
           message: "Message to display when activated"
           variable: "Variable to send"
           no-variable: "None"
+        callAiScript: "Invoke AiScript"
+        _callAiScript:
+          functionName: "Function name"
     radioButton: "Choice"
     _radioButton:
       name: "Variable name"
@@ -939,6 +963,7 @@ _pages:
       _splitStrByLine:
         arg1: "Text"
       ref: "Variables"
+      aiScriptVar: "Variable of AiScript"
       fn: "Functions"
       _fn:
         slots: "Slots"

locales/es-ES.yml

@@ -60,7 +60,7 @@ lists: "Listas"
 noLists: "No tiene listas"
 note: "Notas"
 notes: "Notas"
-following: "Sigue"
+following: "Siguiendo"
 followers: "Seguidores"
 followsYou: "Te sigue"
 createList: "Crear lista"
@@ -265,6 +265,7 @@ watch: "Ver"
 unwatch: "Dejar de ver"
 accept: "Aceptar"
 reject: "Rechazar"
+normal: "Normal"
 instanceName: "Nombre de la instancia"
 instanceDescription: "Descripción de la instancia"
 maintainerName: "Nombre del administrador"
@@ -319,6 +320,7 @@ notesAndReplies: "Notas y respuestas"
 withFiles: "Adjuntos"
 silence: "Silenciar"
 silenceConfirm: "¿Desea silenciar al usuario?"
+unsilence: "Dejar de silenciar"
 unsilenceConfirm: "¿Desea dejar de silenciar al usuario?"
 popularUsers: "Usuarios populares"
 recentlyUpdatedUsers: "Usuarios activos recientemente"
@@ -350,8 +352,6 @@ unregister: "Cancelar registro"
 passwordLessLogin: "Iniciar sesión sin contraseña"
 resetPassword: "Resetear contraseña"
 newPasswordIs: "La nueva contraseña es \"{password}\""
-post: "Nota"
-posted: "Posteado"
 autoReloadWhenDisconnected: "Recargar automáticamente cuando el servidor está desconectado"
 autoNoteWatch: "Ver nota automáticamente"
 autoNoteWatchDescription: "Recibe notificaciones sobre las notas de otros usuarios que a los que respondiste y reaccionaste"
@@ -454,6 +454,8 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "Especifique una región como 'xx-east-1'. Si su servicio no tiene distinción sobre regiones, déjelo en blanco o complete con 'us-east-1'."
 objectStorageUseSSL: "Usar SSL"
 objectStorageUseSSLDesc: "Desactive esto si no va a usar HTTPS para la conexión API"
+objectStorageUseProxy: "Conectarse a través de Proxy"
+objectStorageUseProxyDesc: "Desactive esto si no va a usar Proxy para la conexión de Almacenamiento de objetos"
 serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
@@ -476,6 +478,18 @@ state: "Estado"
 sort: "Ordenar"
 ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
+scratchpad: "Scratch pad"
+scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Misskey."
+output: "Salida"
+script: "Script"
+disablePagesScript: "Deshabilitar AiScript en Páginas"
+updateRemoteUser: "Actualizar información de usuario remoto"
+deleteAllFiles: "Borrar todos los archivos"
+deleteAllFilesConfirm: "¿Desea borrar todos los archivos?"
+removeAllFollowing: "Retener todos los siguientes"
+removeAllFollowingDescription: "Cancelar todos los siguientes del servidor {host}. Ejecutar en caso de que esta instancia haya dejado de existir"
+userSuspended: "Este usuario ha sido suspendido."
+userSilenced: "Este usuario ha sido silenciado."
 _theme:
   explore: "Explorar temas"
   install: "Instalar tema"
@@ -739,6 +753,8 @@ _pages:
     post: "Formulario"
     _post:
       text: "Contenido"
+      attachCanvasImage: "Nota con lienzo como imagen"
+      canvasId: "Lienzo ID"
     textInput: "Entrada de texto"
     _textInput:
       name: "Nombre de variable"
@@ -754,6 +770,11 @@ _pages:
       name: "Nombre de variable"
       text: "Título"
       default: "Valor predeterminado"
+    canvas: "Lienzo"
+    _canvas:
+      id: "Lienzo ID"
+      width: "Ancho"
+      height: "Altura"
     switch: "Interruptor"
     _switch:
       name: "Nombre de variable"
@@ -779,6 +800,9 @@ _pages:
           message: "Mensaje mostrado al apretar"
           variable: "Variable a enviar"
           no-variable: "Ninguna"
+        callAiScript: "Invocar AiScript"
+        _callAiScript:
+          functionName: "Nombre de la función"
     radioButton: "Botón de opción"
     _radioButton:
       name: "Nombre de variable"
@@ -939,6 +963,7 @@ _pages:
       _splitStrByLine:
         arg1: "Texto"
       ref: "Variables"
+      aiScriptVar: "Variable de AiScript"
       fn: "funciones"
       _fn:
         slots: "Slots"

locales/fr-FR.yml

@@ -265,6 +265,7 @@ watch: "Surveiller"
 unwatch: "Ne plus surveiller"
 accept: "Autoriser"
 reject: "Refuser"
+normal: "Normal"
 instanceName: "Nom de l’instance"
 instanceDescription: "Description de l’instance"
 maintainerName: "Nom d'administrateur"
@@ -319,6 +320,7 @@ notesAndReplies: "Notes et Répondres"
 withFiles: "Avec fichiers joints"
 silence: "Mettre en masquer"
 silenceConfirm: "Mettre l'utilisateur sous masquer ?"
+unsilence: "Annuler la masquer"
 unsilenceConfirm: "Voulez-vous annuler le masquer ?"
 popularUsers: "Utilisateur·rice·s populaires"
 recentlyUpdatedUsers: "Utilisateur·rice·s actif·ve·s récemment"
@@ -350,8 +352,6 @@ unregister: "Se désinscrire"
 passwordLessLogin: "Connectez-vous sans mot de passe"
 resetPassword: "Réinitialiser mot de passe"
 newPasswordIs: "Votre nouveau mot de passe est \"{password}\""
-post: "Publier"
-posted: "Publié !"
 autoReloadWhenDisconnected: "Rechargement automatique lorsque le serveur se déconnecte"
 autoNoteWatch: "Surveiller automatique pour les notes"
 autoNoteWatchDescription: "Soyez informé des notes auxquelles vous avez réagi ou répondu."
@@ -454,6 +454,8 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "Spécifiez une région comme 'xx-east-1'. Si votre service ne fait pas de distinction entre les régions, laissez-le vide ou remplissez 'us-east-1'."
 objectStorageUseSSL: "Utiliser SSL"
 objectStorageUseSSLDesc: "Désactivez-le si vous n'utilisez pas HTTPS pour la connexion API"
+objectStorageUseProxy: "Se connecter via proxy"
+objectStorageUseProxyDesc: "Désactivez-le si vous n'utilisez pas Proxy pour la connexion de stockage d'objets"
 serverLogs: "Journaux serveur"
 deleteAll: "Supprimer tout"
 showFixedPostForm: "Afficher le formulaire en haut du fil d'actualité"
@@ -476,6 +478,18 @@ state: "État"
 sort: "Trier"
 ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
+scratchpad: "Scratch pad"
+scratchpadDescription: "Scratchpad fournit un environnement expérimental pour AiScript. Vous pouvez écrire, exécuter et vérifier les résultats qui interagissent avec Misskey."
+output: "Sortie"
+script: "Script"
+disablePagesScript: "Désactiver AiScript sur les Pages"
+updateRemoteUser: "Mettre à jour les informations de l’utilisateur·rice distant·e"
+deleteAllFiles: "Supprimer tous les fichiers"
+deleteAllFilesConfirm: "Êtes vous surs de vouloir supprimer tous les fichiers ?"
+removeAllFollowing: "Retenir tous les abonnements"
+removeAllFollowingDescription: "Se désabonner de tous les comptes de {host}. Exécutez cette commande si l'instance n'existe plus."
+userSuspended: "Cette utilisateur·trice a été suspendue."
+userSilenced: "Cette utilisateur·trice a été masquer."
 _theme:
   explore: "Explorer les thèmes"
   install: "Installer un thème"
@@ -739,6 +753,8 @@ _pages:
     post: "Formulaire à publier"
     _post:
       text: "Contenu"
+      attachCanvasImage: "Publier avec Toile comme image"
+      canvasId: "Toile ID"
     textInput: "Entrée de textuelle"
     _textInput:
       name: "Nom de la variable"
@@ -754,6 +770,11 @@ _pages:
       name: "Nom de la variable"
       text: "Titre"
       default: "Valeur par défaut"
+    canvas: "Toile"
+    _canvas:
+      id: "Toile ID"
+      width: "Largeur"
+      height: "Hauteur"
     switch: "Basculer"
     _switch:
       name: "Nom de la variable"
@@ -779,6 +800,9 @@ _pages:
           message: "Message à afficher lorsque appuyé"
           variable: "Variable à envoyer"
           no-variable: "Rien"
+        callAiScript: "Appeler AiScript"
+        _callAiScript:
+          functionName: "Nom de la fonction"
     radioButton: "Choix"
     _radioButton:
       name: "Nom de la variable"
@@ -939,6 +963,7 @@ _pages:
       _splitStrByLine:
         arg1: "Texte"
       ref: "Variables"
+      aiScriptVar: "Variable d'AiScript"
       fn: "Fonction"
       _fn:
         slots: "Slots"

locales/ja-JP.yml

@@ -265,6 +265,7 @@ watch: "ウォッチ"
 unwatch: "ウォッチ解除"
 accept: "許可"
 reject: "拒否"
+normal: "正常"
 instanceName: "インスタンス名"
 instanceDescription: "インスタンスの紹介"
 maintainerName: "管理者の名前"
@@ -319,6 +320,7 @@ notesAndReplies: "投稿と返信"
 withFiles: "ファイル付き"
 silence: "サイレンス"
 silenceConfirm: "サイレンスしますか？"
+unsilence: "サイレンス解除"
 unsilenceConfirm: "サイレンス解除しますか？"
 popularUsers: "人気のユーザー"
 recentlyUpdatedUsers: "最近投稿したユーザー"
@@ -350,8 +352,6 @@ unregister: "登録を解除"
 passwordLessLogin: "パスワード無しログイン"
 resetPassword: "パスワードをリセット"
 newPasswordIs: "新しいパスワードは「{password}」です"
-post: "投稿"
-posted: "投稿しました"
 autoReloadWhenDisconnected: "サーバー切断時に自動リロード"
 autoNoteWatch: "ノートの自動ウォッチ"
 autoNoteWatchDescription: "あなたがリアクションしたり返信したりした他のユーザーのノートに関する通知を受け取るようにします。"
@@ -454,6 +454,8 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "'xx-east-1'のようなregionを指定してください。使用サービスにregionの概念がない場合は、空または'us-east-1'にしてください。"
 objectStorageUseSSL: "SSLを使用する"
 objectStorageUseSSLDesc: "API接続にhttpsを使用しない場合はオフにしてください"
+objectStorageUseProxy: "Proxyを利用する"
+objectStorageUseProxyDesc: "API接続にproxyを利用しない場合はオフにしてください"
 serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
@@ -479,6 +481,15 @@ descendingOrder: "降順"
 scratchpad: "スクラッチパッド"
 scratchpadDescription: "スクラッチパッドは、AiScriptの実験環境を提供します。Misskeyと対話するコードの記述、実行、結果の確認ができます。"
 output: "出力"
+script: "スクリプト"
+disablePagesScript: "Pagesのスクリプトを無効にする"
+updateRemoteUser: "リモートユーザー情報の更新"
+deleteAllFiles: "すべてのファイルを削除"
+deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
+removeAllFollowing: "フォローを全解除"
+removeAllFollowingDescription: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
+userSuspended: "このユーザーは凍結されています。"
+userSilenced: "このユーザーはサイレンスされています。"
 
 _theme:
   explore: "テーマを探す"
@@ -765,6 +776,8 @@ _pages:
     post: "投稿フォーム"
     _post:
       text: "内容"
+      attachCanvasImage: "キャンバスの画像を添付する"
+      canvasId: "キャンバスID"
 
     textInput: "テキスト入力"
     _textInput:
@@ -784,6 +797,12 @@ _pages:
       text: "タイトル"
       default: "デフォルト値"
 
+    canvas: "キャンバス"
+    _canvas:
+      id: "キャンバスID"
+      width: "幅"
+      height: "高さ"
+
     switch: "スイッチ"
     _switch:
       name: "変数名"
@@ -811,6 +830,9 @@ _pages:
           message: "押したときに表示するメッセージ"
           variable: "送信する変数"
           no-variable: "なし"
+        callAiScript: "AiScript呼び出し"
+        _callAiScript:
+          functionName: "関数名"
 
     radioButton: "選択肢"
     _radioButton:
@@ -973,6 +995,7 @@ _pages:
       _splitStrByLine:
         arg1: "テキスト"
       ref: "変数"
+      aiScriptVar: "AiScript変数"
       fn: "関数"
       _fn:
         slots: "スロット"

locales/ko-KR.yml

@@ -265,6 +265,7 @@ watch: "지켜보기"
 unwatch: "지켜보기 해제"
 accept: "허가"
 reject: "거부"
+normal: "정상"
 instanceName: "인스턴스 이름"
 instanceDescription: "인스턴스 소개"
 maintainerName: "관리자 이름"
@@ -319,6 +320,7 @@ notesAndReplies: "글과 답글"
 withFiles: "미디어"
 silence: "사일런스"
 silenceConfirm: "이 계정을 사일런스로 설정하시겠습니까?"
+unsilence: "사일런스 해제"
 unsilenceConfirm: "이 계정의 사일런스를 해제하시겠습니까?"
 popularUsers: "인기 유저"
 recentlyUpdatedUsers: "최근 활동한 유저"
@@ -350,8 +352,6 @@ unregister: "등록 해제"
 passwordLessLogin: "비밀번호 없이 로그인"
 resetPassword: "비밀번호 재설정"
 newPasswordIs: "새로운 비밀번호는 \"{password}\" 입니다"
-post: "작성"
-posted: "게시하였습니다"
 autoReloadWhenDisconnected: "서버와의 연결이 끊기면 자동 새로고침"
 autoNoteWatch: "노트를 자동으로 지켜보기"
 autoNoteWatchDescription: "리액션하거나 답글을 남긴 다른 유저의 노트에 대한 알림을 받습니다."
@@ -454,6 +454,8 @@ objectStorageRegion: "Region"
 objectStorageRegionDesc: "'xx-east-1'와 같이 region을 지정해주세요. 사용하는 서비스에 region 개념이 없는 경우, 비워 두거나 'us-east-1'으로 설정해 주세요."
 objectStorageUseSSL: "SSL 사용"
 objectStorageUseSSLDesc: "API 호출시 HTTPS 를 사용하지 않는 경우 OFF 로 설정해 주세요"
+objectStorageUseProxy: "연결에 프록시를 사용"
+objectStorageUseProxyDesc: "오브젝트 스토리지 API 호출시 프록시를 사용하지 않는 경우 OFF 로 설정해 주세요"
 serverLogs: "서버 로그"
 deleteAll: "모두 삭제"
 showFixedPostForm: "타임라인 상단에 글 작성란을 표시"
@@ -476,6 +478,18 @@ state: "상태"
 sort: "정렬"
 ascendingOrder: "오름차순"
 descendingOrder: "내림차순"
+scratchpad: "스크래치 패드"
+scratchpadDescription: "스크래치 패드는 AiScript 의 테스트 환경을 제공합니다. Misskey 와 상호 작용하는 코드를 작성, 실행 및 결과를 확인할 수 있습니다."
+output: "출력"
+script: "스크립트"
+disablePagesScript: "Pages 에서 AiScript 를 사용하지 않음"
+updateRemoteUser: "리모트 유저 정보 갱신"
+deleteAllFiles: "모든 파일 삭제"
+deleteAllFilesConfirm: "모든 파일을 삭제하시겠습니까?"
+removeAllFollowing: "모든 팔로잉 해제"
+removeAllFollowingDescription: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 인스턴스가 더 이상 존재하지 않게 된 경우 등에 실행해 주세요."
+userSuspended: "이 계정은 정지된 상태입니다."
+userSilenced: "이 계정은 사일런스된 상태입니다."
 _theme:
   explore: "테마 찾아보기"
   install: "테마 설치"
@@ -739,6 +753,8 @@ _pages:
     post: "글 입력란"
     _post:
       text: "내용"
+      attachCanvasImage: "캔버스의 이미지와 함께 게시하기"
+      canvasId: "캔버스 ID"
     textInput: "텍스트 입력"
     _textInput:
       name: "변수명"
@@ -754,6 +770,11 @@ _pages:
       name: "변수명"
       text: "제목"
       default: "기본값"
+    canvas: "캔버스"
+    _canvas:
+      id: "캔버스 ID"
+      width: "폭"
+      height: "높이"
     switch: "스위치"
     _switch:
       name: "변수명"
@@ -779,6 +800,9 @@ _pages:
           message: "눌렀을 때 표시할 페이지"
           variable: "보낼 변수"
           no-variable: "없음"
+        callAiScript: "AiScript 호출"
+        _callAiScript:
+          functionName: "함수명"
     radioButton: "선택지"
     _radioButton:
       name: "변수명"
@@ -939,6 +963,7 @@ _pages:
       _splitStrByLine:
         arg1: "텍스트"
       ref: "변수"
+      aiScriptVar: "AiScript 변수"
       fn: "함수"
       _fn:
         slots: "슬롯"

locales/zh-CN.yml

@@ -265,6 +265,7 @@ watch: "关注"
 unwatch: "取消关注"
 accept: "允许"
 reject: "拒绝"
+normal: "正常"
 instanceName: "实例名称"
 instanceDescription: "实例介绍"
 maintainerName: "管理员名称"
@@ -319,6 +320,7 @@ notesAndReplies: "帖子与回复"
 withFiles: "附件"
 silence: "禁言"
 silenceConfirm: "确认要禁言吗？"
+unsilence: "解除禁言"
 unsilenceConfirm: "要解除禁言吗？"
 popularUsers: "热门用户"
 recentlyUpdatedUsers: "最近投稿用户"
@@ -350,8 +352,6 @@ unregister: "删除账户"
 passwordLessLogin: "无密码登录"
 resetPassword: "重置密码"
 newPasswordIs: "新的密码是「{password}」"
-post: "投稿"
-posted: "已投稿"
 autoReloadWhenDisconnected: "断开连接时自动重新加载"
 autoNoteWatch: "自动关注帖子"
 autoNoteWatchDescription: "让您能够收到关于「反应」和回复其他用户的帖子的通知。"
@@ -454,6 +454,7 @@ objectStorageRegion: "可用区"
 objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。"
 objectStorageUseSSL: "使用SSL"
 objectStorageUseSSLDesc: "如果不使用https进行API连接，请关闭。"
+objectStorageUseProxy: "使用代理"
 serverLogs: "服务器日志"
 deleteAll: "删除全部"
 showFixedPostForm: "在时间线顶部显示帖子表单"
@@ -476,6 +477,17 @@ state: "状态"
 sort: "排序"
 ascendingOrder: "升序"
 descendingOrder: "降序"
+scratchpad: "暂存器"
+output: "输出"
+script: "脚本"
+disablePagesScript: "禁用页面脚本"
+updateRemoteUser: "更新远程用户信息"
+deleteAllFiles: "删除所有文件"
+deleteAllFilesConfirm: "要删除所有文件吗？"
+removeAllFollowing: "取消所有关注"
+removeAllFollowingDescription: "取消{host}的所有关注者。当实例不存在时执行。"
+userSuspended: "该用户已被冻结。"
+userSilenced: "该用户已被禁言。"
 _theme:
   explore: "寻找主题"
   install: "安装主题"
@@ -739,6 +751,8 @@ _pages:
     post: "投稿窗口"
     _post:
       text: "内容"
+      attachCanvasImage: "附加画布图像"
+      canvasId: "画布ID"
     textInput: "文本输入"
     _textInput:
       name: "变量名"
@@ -754,6 +768,11 @@ _pages:
       name: "变量名"
       text: "标题"
       default: "默认值"
+    canvas: "画布"
+    _canvas:
+      id: "画布ID"
+      width: "宽度"
+      height: "高度"
     switch: "开关"
     _switch:
       name: "变量名"
@@ -779,6 +798,9 @@ _pages:
           message: "按下时显示的消息"
           variable: "发送的变量"
           no-variable: "空"
+        callAiScript: "调用AiScript"
+        _callAiScript:
+          functionName: "函数名"
     radioButton: "选择项"
     _radioButton:
       name: "变量名"
@@ -939,6 +961,7 @@ _pages:
       _splitStrByLine:
         arg1: "文本"
       ref: "变量"
+      aiScriptVar: "AiScript变量"
       fn: "函数"
       _fn:
         slots: "槽函数"

locales/zh-TW.yml

@@ -256,8 +256,6 @@ userList: "清單"
 passwordLessLogin: "設置無密碼登入"
 resetPassword: "重置密碼"
 newPasswordIs: "新密碼為「{password}」"
-post: "投稿"
-posted: "投稿完成"
 autoReloadWhenDisconnected: "和伺服器斷線時自動重新載入"
 autoNoteWatch: "自動關注筆記"
 autoNoteWatchDescription: "收到反應或回覆過的筆記的通知"

migration/1586624197029-AddObjectStorageUseProxy.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from 'typeorm';
+
+export class AddObjectStorageUseProxy1586624197029 implements MigrationInterface {
+		name = 'AddObjectStorageUseProxy1586624197029'
+
+		public async up(queryRunner: QueryRunner): Promise<void> {
+				await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageUseProxy" boolean NOT NULL DEFAULT true`, undefined);
+		}
+
+		public async down(queryRunner: QueryRunner): Promise<void> {
+				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageUseProxy"`, undefined);
+		}
+
+}

migration/1586641139527-remote-reaction.ts

@@ -0,0 +1,12 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class remoteReaction1586641139527 implements MigrationInterface {
+    name = 'remoteReaction1586641139527'
+    public async up(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(260)`, undefined);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.query(`ALTER TABLE "note_reaction" ALTER COLUMN "reaction" TYPE character varying(130)`, undefined);
+  }
+}

migration/1586708940386-pageAiScript.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class pageAiScript1586708940386 implements MigrationInterface {
+    name = 'pageAiScript1586708940386'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "page" ADD "script" character varying(16384) NOT NULL DEFAULT ''`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "script"`, undefined);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.30.0",
+	"version": "12.35.2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -42,9 +42,9 @@
 		"@koa/cors": "3.0.0",
 		"@koa/multer": "2.0.2",
 		"@koa/router": "8.0.8",
-		"@syuilo/aiscript": "0.0.2",
+		"@syuilo/aiscript": "0.4.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.12.1",
+		"@types/bull": "3.12.2",
 		"@types/cbor": "5.0.0",
 		"@types/dateformat": "3.0.1",
 		"@types/double-ended-queue": "2.1.1",
@@ -55,7 +55,7 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.3",
-		"@types/jsdom": "16.2.0",
+		"@types/jsdom": "16.2.1",
 		"@types/katex": "0.11.0",
 		"@types/koa": "2.11.3",
 		"@types/koa-bodyparser": "4.3.0",
@@ -72,8 +72,8 @@
 		"@types/lolex": "5.1.0",
 		"@types/markdown-it": "0.0.9",
 		"@types/mocha": "7.0.2",
-		"@types/node": "13.11.0",
-		"@types/node-fetch": "2.5.5",
+		"@types/node": "13.13.0",
+		"@types/node-fetch": "2.5.6",
 		"@types/nodemailer": "6.4.0",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
@@ -84,7 +84,7 @@
 		"@types/qrcode": "1.3.4",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.17",
+		"@types/redis": "2.8.18",
 		"@types/rename": "1.0.1",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.3",
@@ -100,19 +100,18 @@
 		"@types/webpack": "4.41.10",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "1.0.0",
-		"@types/ws": "7.2.3",
-		"@typescript-eslint/parser": "2.26.0",
+		"@types/ws": "7.2.4",
+		"@typescript-eslint/parser": "2.28.0",
 		"abort-controller": "3.0.0",
-		"animejs": "3.1.0",
-		"apexcharts": "3.17.1",
+		"apexcharts": "3.18.1",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.653.0",
+		"aws-sdk": "2.658.0",
 		"bcryptjs": "2.4.3",
 		"bull": "3.13.0",
 		"cafy": "15.2.1",
-		"cbor": "5.0.1",
+		"cbor": "5.0.2",
 		"chai": "4.2.0",
 		"chalk": "4.0.0",
 		"chart.js": "2.9.3",
@@ -120,7 +119,7 @@
 		"commander": "4.1.1",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "3.4.2",
+		"css-loader": "3.5.2",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"diskusage": "1.1.3",
@@ -135,7 +134,7 @@
 		"glob": "7.1.6",
 		"gulp": "4.0.2",
 		"gulp-clean-css": "4.3.0",
-		"gulp-dart-sass": "1.0.0",
+		"gulp-dart-sass": "1.0.1",
 		"gulp-mocha": "7.0.2",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.0.0",
@@ -153,13 +152,13 @@
 		"is-svg": "4.2.1",
 		"js-yaml": "3.13.1",
 		"jsdom": "16.2.2",
-		"json5": "2.1.2",
+		"json5": "2.1.3",
 		"json5-loader": "3.0.0",
-		"jsrsasign": "8.0.13",
+		"jsrsasign": "8.0.15",
 		"katex": "0.11.1",
 		"koa": "2.11.0",
 		"koa-bodyparser": "4.3.0",
-		"koa-compress": "3.0.0",
+		"koa-compress": "3.1.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
@@ -184,11 +183,11 @@
 		"os-utils": "0.0.14",
 		"parse5": "5.1.1",
 		"parsimmon": "1.13.0",
-		"pg": "8.0.0",
+		"pg": "8.0.2",
 		"portal-vue": "2.1.7",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"prismjs": "1.19.0",
+		"prismjs": "1.20.0",
 		"probe-image-size": "5.0.0",
 		"progress-bar-webpack-plugin": "2.1.0",
 		"promise-limit": "2.7.0",
@@ -219,10 +218,10 @@
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
-		"style-loader": "1.1.3",
+		"style-loader": "1.1.4",
 		"summaly": "2.3.1",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "4.23.1",
+		"systeminformation": "4.23.3",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "2.3.5",
 		"textarea-caret": "3.1.0",
@@ -230,7 +229,7 @@
 		"tinycolor2": "1.4.1",
 		"tmp": "0.1.0",
 		"ts-loader": "6.2.2",
-		"ts-node": "8.8.1",
+		"ts-node": "8.8.2",
 		"tslint": "6.1.1",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.24",
@@ -243,13 +242,13 @@
 		"vue": "2.6.11",
 		"vue-color": "2.7.1",
 		"vue-content-loading": "1.6.0",
-		"vue-cropperjs": "4.0.1",
-		"vue-i18n": "8.16.0",
+		"vue-cropperjs": "4.1.0",
+		"vue-i18n": "8.17.2",
 		"vue-json-pretty": "1.6.3",
 		"vue-loader": "15.9.1",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-meta": "2.3.3",
-		"vue-prism-component": "1.1.1",
+		"vue-prism-component": "1.2.0",
 		"vue-prism-editor": "0.5.1",
 		"vue-router": "3.1.6",
 		"vue-style-loader": "4.1.2",

src/client/components/link.vue

@@ -14,6 +14,7 @@ import Vue from 'vue';
 import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { url as local } from '../config';
 import MkUrlPreview from './url-preview-popup.vue';
+import { isDeviceTouch } from '../scripts/is-device-touch';
 
 export default Vue.extend({
 	props: {
@@ -61,11 +62,13 @@ export default Vue.extend({
 			}
 		},
 		onMouseover() {
+			if (isDeviceTouch()) return;
 			clearTimeout(this.showTimer);
 			clearTimeout(this.hideTimer);
 			this.showTimer = setTimeout(this.showPreview, 500);
 		},
 		onMouseleave() {
+			if (isDeviceTouch()) return;
 			clearTimeout(this.showTimer);
 			clearTimeout(this.hideTimer);
 			this.hideTimer = setTimeout(this.closePreview, 500);

src/client/components/media-image.vue

@@ -1,12 +1,12 @@
 <template>
-<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="image.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false">
+<div class="qjewsnkgzzxlxtzncydssfbgjibiehcy" v-if="hide" @click="hide = false">
 	<div>
 		<b><fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b>
 		<span>{{ $t('clickToShow') }}</span>
 	</div>
 </div>
 <div class="gqnyydlzavusgskkfvwvjiattxdzsqlf" v-else>
-	<i><fa :icon="faEyeSlash" @click="hide = true"></fa></i>
+	<i><fa :icon="faEyeSlash" @click="hide = true"/></i>
 	<a
 		:href="image.url"
 		:style="style"
@@ -63,6 +63,9 @@ export default Vue.extend({
 			};
 		}
 	},
+	created() {
+		this.hide = this.image.isSensitive && !this.$store.state.device.alwaysShowNsfw;
+	},
 	methods: {
 		onClick() {
 			if (this.$store.state.device.imageNewTab) {

src/client/components/media-list.vue

@@ -34,9 +34,7 @@ export default Vue.extend({
 			default: false
 		},
 		// specify the parent element
-		parentElement: {
-			type: Object
-		}
+		parentElement: {}
 	},
 	data() {
 		return {
@@ -69,7 +67,7 @@ export default Vue.extend({
 
 				if (this.$refs.gridOuter) {
 					let height = 287;
-					const parent = this.$props.parentElement || this.$parent.$el;
+					const parent = this.parentElement || this.$parent.$el;
 
 					if (this.$refs.gridOuter.clientHeight) {
 						height = this.$refs.gridOuter.clientHeight;
@@ -83,6 +81,11 @@ export default Vue.extend({
 				}
 			});
 		}
+	},
+	watch: {
+		parentElement() {
+			this.size();
+		}
 	}
 });
 </script>

src/client/components/media-video.vue

@@ -1,12 +1,12 @@
 <template>
-<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="video.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false">
+<div class="icozogqfvdetwohsdglrbswgrejoxbdj" v-if="hide" @click="hide = false">
 	<div>
-		<b><fa icon="exclamation-triangle"/> {{ $t('sensitive') }}</b>
+		<b><fa :icon="faExclamationTriangle"/> {{ $t('sensitive') }}</b>
 		<span>{{ $t('clickToShow') }}</span>
 	</div>
 </div>
 <div class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else>
-	<i><fa :icon="faEyeSlash" @click="hide = true"></fa></i>
+	<i><fa :icon="faEyeSlash" @click="hide = true"/></i>
 	<a
 		:href="video.url"
 		rel="nofollow noopener"
@@ -21,7 +21,8 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faPlayCircle, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
+import { faPlayCircle } from '@fortawesome/free-regular-svg-icons';
+import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../i18n';
 
 export default Vue.extend({
@@ -36,6 +37,7 @@ export default Vue.extend({
 		return {
 			hide: true,
 			faPlayCircle,
+			faExclamationTriangle,
 			faEyeSlash
 		};
 	},
@@ -45,7 +47,10 @@ export default Vue.extend({
 				'background-image': `url(${this.video.thumbnailUrl})`
 			};
 		}
-	}
+	},
+	created() {
+		this.hide = this.video.isSensitive && !this.$store.state.device.alwaysShowNsfw;
+	},
 });
 </script>
 

src/client/components/note.vue

@@ -33,7 +33,7 @@
 		<mk-avatar class="avatar" :user="appearNote.user"/>
 		<div class="main">
 			<x-note-header class="header" :note="appearNote" :mini="true"/>
-			<div class="body" v-if="appearNote.deletedAt == null">
+			<div class="body" v-if="appearNote.deletedAt == null" ref="noteBody">
 				<p v-if="appearNote.cw != null" class="cw">
 				<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 					<x-cw-button v-model="showContent" :note="appearNote"/>
@@ -46,7 +46,7 @@
 						<a class="rp" v-if="appearNote.renote != null">RN:</a>
 					</div>
 					<div class="files" v-if="appearNote.files.length > 0">
-						<x-media-list :media-list="appearNote.files"/>
+						<x-media-list :media-list="appearNote.files" :parent-element="noteBody"/>
 					</div>
 					<x-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
 					<mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="true" class="url-preview"/>
@@ -142,6 +142,7 @@ export default Vue.extend({
 			replies: [],
 			showContent: false,
 			hideThisNote: false,
+			noteBody: this.$refs.noteBody,
 			faEdit, faBolt, faTimes, faBullhorn, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan
 		};
 	},
@@ -254,6 +255,8 @@ export default Vue.extend({
 		if (this.$store.getters.isSignedIn) {
 			this.connection.on('_connected_', this.onStreamConnected);
 		}
+
+		this.noteBody = this.$refs.noteBody
 	},
 
 	beforeDestroy() {
@@ -301,6 +304,14 @@ export default Vue.extend({
 				case 'reacted': {
 					const reaction = body.reaction;
 
+					if (body.emoji) {
+						const emojis = this.appearNote.emojis || [];
+						if (!emojis.includes(body.emoji)) {
+							emojis.push(body.emoji);
+							Vue.set(this.appearNote, 'emojis', emojis);
+						}
+					}
+
 					if (this.appearNote.reactions == null) {
 						Vue.set(this.appearNote, 'reactions', {});
 					}
@@ -561,13 +572,13 @@ export default Vue.extend({
 					}]
 					: []
 				),
-				...(this.appearNote.userId == this.$store.state.i.id ? [
+				...(this.appearNote.userId == this.$store.state.i.id || this.$store.state.i.isModerator || this.$store.state.i.isAdmin ? [
 					null,
-					{
+					this.appearNote.userId == this.$store.state.i.id ? {
 						icon: faEdit,
 						text: this.$t('deleteAndEdit'),
 						action: this.delEdit
-					},
+					} : undefined,
 					{
 						icon: faTrashAlt,
 						text: this.$t('delete'),

src/client/components/notification.vue

@@ -12,7 +12,7 @@
 			<fa :icon="faReply" v-else-if="notification.type === 'reply'"/>
 			<fa :icon="faAt" v-else-if="notification.type === 'mention'"/>
 			<fa :icon="faQuoteLeft" v-else-if="notification.type === 'quote'"/>
-			<x-reaction-icon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction" :no-style="true"/>
+			<x-reaction-icon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction" :customEmojis="notification.note.emojis" :no-style="true"/>
 		</div>
 	</div>
 	<div class="tail">

src/client/components/page/page.block.vue

@@ -17,10 +17,11 @@ 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';
+import XCanvas from './page.canvas.vue';
 
 export default Vue.extend({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton, XCanvas
 	},
 	props: {
 		value: {

src/client/components/page/page.button.vue

@@ -28,7 +28,7 @@ export default Vue.extend({
 					text: this.script.interpolate(this.value.content)
 				});
 			} else if (this.value.action === 'resetRandom') {
-				this.script.aiScript.updateRandomSeed(Math.random());
+				this.script.aoiScript.updateRandomSeed(Math.random());
 				this.script.eval();
 			} else if (this.value.action === 'pushEvent') {
 				this.$root.api('page-push', {
@@ -43,6 +43,8 @@ export default Vue.extend({
 					type: 'success',
 					text: this.script.interpolate(this.value.message)
 				});
+			} else if (this.value.action === 'callAiScript') {
+				this.script.callAiScript(this.value.fn);
 			}
 		}
 	}

src/client/components/page/page.canvas.vue

@@ -0,0 +1,36 @@
+<template>
+<div class="ysrxegms">
+	<canvas ref="canvas" :width="value.width" :height="value.height"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+	mounted() {
+		this.script.aoiScript.registerCanvas(this.value.name, this.$refs.canvas);
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.ysrxegms {
+	display: inline-block;
+	vertical-align: bottom;
+	overflow: auto;
+	max-width: 100%;
+
+	> canvas {
+		display: block;
+	}
+}
+</style>

src/client/components/page/page.counter.vue

@@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	},

src/client/components/page/page.number-input.vue

@@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	}

src/client/components/page/page.post.vue

@@ -1,15 +1,17 @@
 <template>
 <div class="ngbfujlo">
 	<mk-textarea :value="text" readonly style="margin: 0;"></mk-textarea>
-	<mk-button class="button" primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted') : $t('post') }}</mk-button>
+	<mk-button class="button" primary @click="post()" :disabled="posting || posted"><fa v-if="posted" :icon="faCheck"/><fa v-else :icon="faPaperPlane"/></mk-button>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
+import { faCheck, faPaperPlane } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../../i18n';
 import MkTextarea from '../ui/textarea.vue';
 import MkButton from '../ui/button.vue';
+import { apiUrl } from '../../config';
 
 export default Vue.extend({
 	i18n,
@@ -30,6 +32,7 @@ export default Vue.extend({
 			text: this.script.interpolate(this.value.text),
 			posted: false,
 			posting: false,
+			faCheck, faPaperPlane
 		};
 	},
 	watch: {
@@ -41,10 +44,39 @@ export default Vue.extend({
 		}
 	},
 	methods: {
-		post() {
+		upload() {
+			return new Promise((ok) => {
+				const dialog = this.$root.dialog({
+					type: 'waiting',
+					text: this.$t('uploading') + '...',
+					showOkButton: false,
+					showCancelButton: false,
+					cancelableByBgClick: false
+				});
+				const canvas = this.script.aoiScript.canvases[this.value.canvasId];
+				canvas.toBlob(blob => {
+					const data = new FormData();
+					data.append('file', blob);
+					data.append('i', this.$store.state.i.token);
+
+					fetch(apiUrl + '/drive/files/create', {
+						method: 'POST',
+						body: data
+					})
+					.then(response => response.json())
+					.then(f => {
+						dialog.close();
+						ok(f);
+					})
+				});
+			});
+		},
+		async post() {
 			this.posting = true;
+			const file = this.value.attachCanvasImage ? await this.upload() : null;
 			this.$root.api('notes/create', {
-				text: this.text,
+				text: this.text === '' ? null : this.text,
+				fileIds: file ? [file.id] : undefined,
 			}).then(() => {
 				this.posted = true;
 				this.$root.dialog({
@@ -59,9 +91,11 @@ export default Vue.extend({
 
 <style lang="scss" scoped>
 .ngbfujlo {
+	position: relative;
 	padding: 32px;
 	border-radius: 6px;
 	box-shadow: 0 2px 8px var(--shadow);
+	z-index: 1;
 
 	> .button {
 		margin-top: 32px;

src/client/components/page/page.radio-button.vue

@@ -28,7 +28,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	}

src/client/components/page/page.switch.vue

@@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	}

src/client/components/page/page.text-input.vue

@@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	}

src/client/components/page/page.textarea-input.vue

@@ -27,7 +27,7 @@ export default Vue.extend({
 	},
 	watch: {
 		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.aoiScript.updatePageVar(this.value.name, this.v);
 			this.script.eval();
 		}
 	}

src/client/components/page/page.vue

@@ -6,30 +6,31 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import i18n from '../../i18n';
+import { AiScript, parse, values } from '@syuilo/aiscript';
 import { faHeart as faHeartS } from '@fortawesome/free-solid-svg-icons';
 import { faHeart } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../i18n';
 import XBlock from './page.block.vue';
-import { ASEvaluator } from '../../scripts/aiscript/evaluator';
+import { ASEvaluator } from '../../scripts/aoiscript/evaluator';
 import { collectPageVars } from '../../scripts/collect-page-vars';
 import { url } from '../../config';
 
 class Script {
-	public aiScript: ASEvaluator;
+	public aoiScript: ASEvaluator;
 	private onError: any;
 	public vars: Record<string, any>;
 	public page: Record<string, any>;
 
-	constructor(page, aiScript, onError) {
+	constructor(page, aoiScript, onError) {
 		this.page = page;
-		this.aiScript = aiScript;
+		this.aoiScript = aoiScript;
 		this.onError = onError;
 		this.eval();
 	}
 
 	public eval() {
 		try {
-			this.vars = this.aiScript.evaluateVars();
+			this.vars = this.aoiScript.evaluateVars();
 		} catch (e) {
 			this.onError(e);
 		}
@@ -38,10 +39,16 @@ class Script {
 	public interpolate(str: string) {
 		if (str == null) return null;
 		return str.replace(/{(.+?)}/g, match => {
-			const v = this.vars[match.slice(1, -1).trim()];
+			const v = this.vars ? this.vars[match.slice(1, -1).trim()] : null;
 			return v == null ? 'NULL' : v.toString();
 		});
 	}
+
+	public callAiScript(fn: string) {
+		try {
+			if (this.aoiScript.aiscript) this.aoiScript.aiscript.execFn(this.aoiScript.aiscript.scope.get(fn), []);
+		} catch (e) {}
+	}
 }
 
 export default Vue.extend({
@@ -67,14 +74,53 @@ export default Vue.extend({
 
 	created() {
 		const pageVars = this.getPageVars();
-		this.script = new Script(this.page, new ASEvaluator(this.page.variables, pageVars, {
+		
+		this.script = new Script(this.page, new ASEvaluator(this, this.page.variables, pageVars, {
 			randomSeed: Math.random(),
 			visitor: this.$store.state.i,
 			page: this.page,
-			url: url
+			url: url,
+			enableAiScript: !this.$store.state.device.disablePagesScript
 		}), e => {
 			console.dir(e);
 		});
+
+		if (this.script.aoiScript.aiscript) this.script.aoiScript.aiscript.scope.opts.onUpdated = (name, value) => {
+			this.script.eval();
+		};
+	},
+
+	mounted() {
+		this.$nextTick(() => {
+			if (this.script.page.script && this.script.aoiScript.aiscript) {
+				let ast;
+				try {
+					ast = parse(this.script.page.script);
+				} catch (e) {
+					console.error(e);
+					/*this.$root.dialog({
+						type: 'error',
+						text: 'Syntax error :('
+					});*/
+					return;
+				}
+				this.script.aoiScript.aiscript.exec(ast).then(() => {
+					this.script.eval();
+				}).catch(e => {
+					console.error(e);
+					/*this.$root.dialog({
+						type: 'error',
+						text: e
+					});*/
+				});
+			} else {
+				this.script.eval();
+			}
+		});
+	},
+
+	beforeDestroy() {
+		if (this.script.aoiScript.aiscript) this.script.aoiScript.aiscript.abort();
 	},
 
 	methods: {

src/client/components/reaction-icon.vue

@@ -1,5 +1,5 @@
 <template>
-<mk-emoji :emoji="reaction.startsWith(':') ? null : reaction" :name="reaction.startsWith(':') ? reaction.substr(1, reaction.length - 2) : null" :is-reaction="true" :normal="true" :no-style="noStyle"/>
+<mk-emoji :emoji="reaction.startsWith(':') ? null : reaction" :name="reaction.startsWith(':') ? reaction.substr(1, reaction.length - 2) : null" :customEmojis="customEmojis" :is-reaction="true" :normal="true" :no-style="noStyle"/>
 </template>
 
 <script lang="ts">
@@ -12,6 +12,10 @@ export default Vue.extend({
 			type: String,
 			required: true
 		},
+		customEmojis: {
+			required: false,
+			default: () => []
+		},
 		noStyle: {
 			type: Boolean,
 			required: false,

src/client/components/reactions-viewer.reaction.vue

@@ -1,7 +1,7 @@
 <template>
 <button
 	class="hkzvhatu _button"
-	:class="{ reacted: note.myReaction == reaction }"
+	:class="{ reacted: note.myReaction == reaction, canToggle }"
 	@click="toggleReaction(reaction)"
 	v-if="count > 0"
 	@mouseover="onMouseover"
@@ -9,7 +9,7 @@
 	ref="reaction"
 	v-particle
 >
-	<x-reaction-icon :reaction="reaction" ref="icon"/>
+	<x-reaction-icon :reaction="reaction" :customEmojis="note.emojis" ref="icon"/>
 	<span>{{ count }}</span>
 </button>
 </template>
@@ -40,11 +40,6 @@ export default Vue.extend({
 			type: Object,
 			required: true,
 		},
-		canToggle: {
-			type: Boolean,
-			required: false,
-			default: true,
-		},
 	},
 	data() {
 		return {
@@ -57,6 +52,9 @@ export default Vue.extend({
 		isMe(): boolean {
 			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
 		},
+		canToggle(): boolean {
+			return !this.reaction.match(/@\w/);
+		},
 	},
 	mounted() {
 		if (!this.isInitial) this.anime();
@@ -144,15 +142,7 @@ export default Vue.extend({
 	padding: 0 6px;
 	border-radius: 4px;
 
-	&.reacted {
-		background: var(--accent);
-
-		> span {
-			color: #fff;
-		}
-	}
-
-	&:not(.reacted) {
+	&.canToggle {
 		background: rgba(0, 0, 0, 0.05);
 
 		&:hover {
@@ -160,6 +150,22 @@ export default Vue.extend({
 		}
 	}
 
+	&:not(.canToggle) {
+		cursor: default;
+	}
+
+	&.reacted {
+		background: var(--accent);
+
+		&:hover {
+			background: var(--accent);
+		}
+
+		> span {
+			color: #fff;
+		}
+	}
+
 	> span {
 		font-size: 0.9em;
 		line-height: 32px;

src/client/components/timeline.vue

@@ -50,7 +50,8 @@ export default Vue.extend({
 		});
 
 		const prepend = note => {
-			(this.$refs.tl as any).prepend(note);
+			const _note = JSON.parse(JSON.stringify(note));	// deepcopy
+			(this.$refs.tl as any).prepend(_note);
 
 			if (this.sound) {
 				this.$root.sound(note.userId === this.$store.state.i.id ? 'noteMy' : 'note');

src/client/components/url-preview-popup.vue

@@ -36,7 +36,7 @@ export default Vue.extend({
 
 	mounted() {
 		const rect = this.source.getBoundingClientRect();
-		const x = ((rect.left + (this.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
+		const x = Math.max((rect.left + (this.source.offsetWidth / 2)) - (300 / 2), 6) + window.pageXOffset;
 		const y = rect.top + this.source.offsetHeight + window.pageYOffset;
 
 		this.top = y;
@@ -50,6 +50,7 @@ export default Vue.extend({
 	position: absolute;
 	z-index: 11000;
 	width: 500px;
+	max-width: calc(90vw - 12px);
 	overflow: hidden;
 	pointer-events: none;
 }

src/client/components/url.vue

@@ -24,6 +24,7 @@ import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { toUnicode as decodePunycode } from 'punycode';
 import { url as local } from '../config';
 import MkUrlPreview from './url-preview-popup.vue';
+import { isDeviceTouch } from '../scripts/is-device-touch';
 
 export default Vue.extend({
 	props: {
@@ -92,11 +93,13 @@ export default Vue.extend({
 			}
 		},
 		onMouseover() {
+			if (isDeviceTouch()) return;
 			clearTimeout(this.showTimer);
 			clearTimeout(this.hideTimer);
 			this.showTimer = setTimeout(this.showPreview, 500);
 		},
 		onMouseleave() {
+			if (isDeviceTouch()) return;
 			clearTimeout(this.showTimer);
 			clearTimeout(this.hideTimer);
 			this.hideTimer = setTimeout(this.closePreview, 500);

src/client/components/user-menu.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers } from '@fortawesome/free-solid-svg-icons';
+import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
 import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../i18n';
 import XMenu from './menu.vue';
@@ -60,8 +60,12 @@ export default Vue.extend({
 				action: this.toggleBlock
 			}]);
 
-			if (this.$store.state.i.isAdmin) {
+			if (this.$store.getters.isSignedIn && (this.$store.state.i.isAdmin || this.$store.state.i.isModerator)) {
 				menu = menu.concat([null, {
+					icon: faMicrophoneSlash,
+					text: this.user.isSilenced ? this.$t('unsilence') : this.$t('silence'),
+					action: this.toggleSilence
+				}, {
 					icon: faSnowflake,
 					text: this.user.isSuspended ? this.$t('unsuspend') : this.$t('suspend'),
 					action: this.toggleSuspend
@@ -194,6 +198,25 @@ export default Vue.extend({
 			});
 		},
 
+		async toggleSilence() {
+			if (!await this.getConfirmed(this.$t(this.user.isSilenced ? 'unsilenceConfirm' : 'silenceConfirm'))) return;
+
+			this.$root.api(this.user.isSilenced ? 'admin/unsilence-user' : 'admin/silence-user', {
+				userId: this.user.id
+			}).then(() => {
+				this.user.isSilenced = !this.user.isSilenced;
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			}, e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			});
+		},
+
 		async toggleSuspend() {
 			if (!await this.getConfirmed(this.$t(this.user.isSuspended ? 'unsuspendConfirm' : 'suspendConfirm'))) return;
 

src/client/components/user-moderate-dialog.vue

@@ -1,105 +0,0 @@
-<template>
-<x-window @closed="() => { $emit('closed'); destroyDom(); }" :avatar="user">
-	<template #header><mk-user-name :user="user"/></template>
-	<div class="vrcsvlkm">
-		<mk-button @click="resetPassword()" primary>{{ $t('resetPassword') }}</mk-button>
-		<mk-switch v-if="$store.state.i.isAdmin && (this.moderator || !user.isAdmin)" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch>
-		<mk-switch @change="toggleSilence()" v-model="silenced">{{ $t('silence') }}</mk-switch>
-		<mk-switch @change="toggleSuspend()" v-model="suspended">{{ $t('suspend') }}</mk-switch>
-	</div>
-</x-window>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../i18n';
-import MkButton from './ui/button.vue';
-import MkSwitch from './ui/switch.vue';
-import XWindow from './window.vue';
-
-export default Vue.extend({
-	i18n,
-
-	components: {
-		MkButton,
-		MkSwitch,
-		XWindow,
-	},
-
-	props: {
-		user: {
-			type: Object,
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			moderator: this.user.isModerator,
-			silenced: this.user.isSilenced,
-			suspended: this.user.isSuspended,
-		};
-	},
-
-	methods: {
-		async resetPassword() {
-			const dialog = this.$root.dialog({
-				type: 'waiting',
-				iconOnly: true
-			});
-
-			this.$root.api('admin/reset-password', {
-				userId: this.user.id,
-			}).then(({ password }) => {
-				this.$root.dialog({
-					type: 'success',
-					text: this.$t('newPasswordIs', { password })
-				});
-			}).catch(e => {
-				this.$root.dialog({
-					type: 'error',
-					text: e
-				});
-			}).finally(() => {
-				dialog.close();
-			});
-		},
-
-		async toggleSilence() {
-			const confirm = await this.$root.dialog({
-				type: 'warning',
-				showCancelButton: true,
-				text: this.silenced ? this.$t('silenceConfirm') : this.$t('unsilenceConfirm'),
-			});
-			if (confirm.canceled) {
-				this.silenced = !this.silenced;
-			} else {
-				this.$root.api(this.silenced ? 'admin/silence-user' : 'admin/unsilence-user', { userId: this.user.id });
-			}
-		},
-
-		async toggleSuspend() {
-			const confirm = await this.$root.dialog({
-				type: 'warning',
-				showCancelButton: true,
-				text: this.suspended ? this.$t('suspendConfirm') : this.$t('unsuspendConfirm'),
-			});
-			if (confirm.canceled) {
-				this.suspended = !this.suspended;
-			} else {
-				this.$root.api(this.suspended ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: this.user.id });
-			}
-		},
-
-		async toggleModerator() {
-			this.$root.api(this.moderator ? 'admin/moderators/add' : 'admin/moderators/remove', { userId: this.user.id });
-		}
-	}
-});
-</script>
-
-<style lang="scss" scoped>
-.vrcsvlkm {
-
-}
-</style>

src/client/pages/instance/federation.instance.vue

@@ -99,10 +99,19 @@
 			<span class="label">{{ $t('operations') }}</span>
 			<mk-switch v-model="isSuspended" class="switch">{{ $t('stopActivityDelivery') }}</mk-switch>
 			<mk-switch :value="isBlocked" class="switch" @change="changeBlock">{{ $t('blockThisInstance') }}</mk-switch>
+			<details>
+				<summary>{{ $t('deleteAllFiles') }}</summary>
+				<mk-button @click="deleteAllFiles()" style="margin: 0.5em 0 0.5em 0;"><fa :icon="faTrashAlt"/> {{ $t('deleteAllFiles') }}</mk-button>
+			</details>
+			<details>
+				<summary>{{ $t('removeAllFollowing') }}</summary>
+				<mk-button @click="removeAllFollowing()" style="margin: 0.5em 0 0.5em 0;"><fa :icon="faMinusCircle"/> {{ $t('removeAllFollowing') }}</mk-button>
+				<mk-info warn>{{ $t('removeAllFollowingDescription', { host: instance.host }) }}</mk-info>
+			</details>
 		</div>
 		<details class="metadata">
 			<summary class="label">{{ $t('metadata') }}</summary>
-			<pre><code>{{ JSON.stringify(instance.metadata, null, 2) }}</code></pre>
+			<pre><code>{{ JSON.stringify(instance, null, 2) }}</code></pre>
 		</details>
 	</div>
 </x-window>
@@ -112,11 +121,13 @@
 import Vue from 'vue';
 import Chart from 'chart.js';
 import i18n from '../../i18n';
-import { faTimes, faCrosshairs, faCloudDownloadAlt, faCloudUploadAlt, faUsers, faPencilAlt, faFileImage, faDatabase, faTrafficLight, faLongArrowAltUp, faLongArrowAltDown } from '@fortawesome/free-solid-svg-icons';
+import { faTimes, faCrosshairs, faCloudDownloadAlt, faCloudUploadAlt, faUsers, faPencilAlt, faFileImage, faDatabase, faTrafficLight, faLongArrowAltUp, faLongArrowAltDown, faMinusCircle, faTrashAlt } from '@fortawesome/free-solid-svg-icons';
 import XWindow from '../../components/window.vue';
 import MkUsersDialog from '../../components/users-dialog.vue';
 import MkSelect from '../../components/ui/select.vue';
+import MkButton from '../../components/ui/button.vue';
 import MkSwitch from '../../components/ui/switch.vue';
+import MkInfo from '../../components/ui/info.vue';
 
 const chartLimit = 90;
 const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
@@ -135,7 +146,9 @@ export default Vue.extend({
 	components: {
 		XWindow,
 		MkSelect,
+		MkButton,
 		MkSwitch,
+		MkInfo,
 	},
 
 	props: {
@@ -153,7 +166,7 @@ export default Vue.extend({
 			chartInstance: null,
 			chartSrc: 'requests',
 			chartSpan: 'hour',
-			faTimes, faCrosshairs, faCloudDownloadAlt, faCloudUploadAlt, faUsers, faPencilAlt, faFileImage, faDatabase, faTrafficLight, faLongArrowAltUp, faLongArrowAltDown
+			faTimes, faCrosshairs, faCloudDownloadAlt, faCloudUploadAlt, faUsers, faPencilAlt, faFileImage, faDatabase, faTrafficLight, faLongArrowAltUp, faLongArrowAltDown, faMinusCircle, faTrashAlt
 		};
 	},
 
@@ -239,6 +252,28 @@ export default Vue.extend({
 			this.chartSrc = src;
 		},
 
+		removeAllFollowing() {
+			this.$root.api('admin/federation/remove-all-following', {
+				host: this.instance.host
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			});
+		},
+
+		deleteAllFiles() {
+			this.$root.api('admin/federation/delete-all-files', {
+				host: this.instance.host
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			});
+		},
+
 		renderChart() {
 			if (this.chartInstance) {
 				this.chartInstance.destroy();

src/client/pages/instance/settings.vue

@@ -116,6 +116,7 @@
 					<mk-input v-model="objectStorageSecretKey" :disabled="!useObjectStorage"><template #icon><fa :icon="faKey"/></template>Secret key</mk-input>
 				</div>
 				<mk-switch v-model="objectStorageUseSSL" :disabled="!useObjectStorage">{{ $t('objectStorageUseSSL') }}<template #desc>{{ $t('objectStorageUseSSLDesc') }}</template></mk-switch>
+				<mk-switch v-model="objectStorageUseProxy" :disabled="!useObjectStorage">{{ $t('objectStorageUseProxy') }}<template #desc>{{ $t('objectStorageUseProxyDesc') }}</template></mk-switch>
 			</template>
 		</div>
 		<div class="_footer">
@@ -249,6 +250,7 @@ export default Vue.extend({
 			objectStorageAccessKey: null,
 			objectStorageSecretKey: null,
 			objectStorageUseSSL: false,
+			objectStorageUseProxy: false,
 			enableTwitterIntegration: false,
 			twitterConsumerKey: null,
 			twitterConsumerSecret: null,
@@ -303,6 +305,7 @@ export default Vue.extend({
 		this.objectStorageAccessKey = this.meta.objectStorageAccessKey;
 		this.objectStorageSecretKey = this.meta.objectStorageSecretKey;
 		this.objectStorageUseSSL = this.meta.objectStorageUseSSL;
+		this.objectStorageUseProxy = this.meta.objectStorageUseProxy;
 		this.enableTwitterIntegration = this.meta.enableTwitterIntegration;
 		this.twitterConsumerKey = this.meta.twitterConsumerKey;
 		this.twitterConsumerSecret = this.meta.twitterConsumerSecret;
@@ -411,6 +414,7 @@ export default Vue.extend({
 				objectStorageAccessKey: this.objectStorageAccessKey ? this.objectStorageAccessKey : null,
 				objectStorageSecretKey: this.objectStorageSecretKey ? this.objectStorageSecretKey : null,
 				objectStorageUseSSL: this.objectStorageUseSSL,
+				objectStorageUseProxy: this.objectStorageUseProxy,
 				enableTwitterIntegration: this.enableTwitterIntegration,
 				twitterConsumerKey: this.twitterConsumerKey,
 				twitterConsumerSecret: this.twitterConsumerSecret,

src/client/pages/instance/users.user.vue

@@ -0,0 +1,209 @@
+<template>
+<div class="vrcsvlkm" v-if="user && info">
+	<portal to="title" v-if="user"><mk-user-name :user="user" :nowrap="false" class="name"/></portal>
+	<portal to="avatar" v-if="user"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
+
+	<section class="_card">
+		<div class="_title">
+			<mk-avatar class="avatar" :user="user"/>
+			<mk-user-name class="name" :user="user"/>
+			<span class="acct">@{{ user | acct }}</span>
+			<span class="staff" v-if="user.isAdmin"><fa :icon="faBookmark"/></span>
+			<span class="staff" v-if="user.isModerator"><fa :icon="farBookmark"/></span>
+			<span class="punished" v-if="user.isSilenced"><fa :icon="faMicrophoneSlash"/></span>
+			<span class="punished" v-if="user.isSuspended"><fa :icon="faSnowflake"/></span>
+		</div>
+		<div class="_content actions">
+			<div style="flex: 1; padding-left: 1em;">
+				<mk-switch v-if="user.host == null && $store.state.i.isAdmin && (this.moderator || !user.isAdmin)" @change="toggleModerator()" v-model="moderator">{{ $t('moderator') }}</mk-switch>
+				<mk-switch @change="toggleSilence()" v-model="silenced">{{ $t('silence') }}</mk-switch>
+				<mk-switch @change="toggleSuspend()" v-model="suspended">{{ $t('suspend') }}</mk-switch>
+			</div>
+			<div style="flex: 1; padding-left: 1em;">
+				<mk-button @click="openProfile"><fa :icon="faExternalLinkSquareAlt"/> {{ $t('profile')}}</mk-button>
+				<mk-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('updateRemoteUser') }}</mk-button>
+				<mk-button @click="resetPassword"><fa :icon="faKey"/> {{ $t('resetPassword') }}</mk-button>
+				<mk-button @click="deleteAllFiles"><fa :icon="faTrashAlt"/> {{ $t('deleteAllFiles') }}</mk-button>
+			</div>
+		</div>
+		<div class="_content rawdata">
+			<pre><code>{{ JSON.stringify(info, null, 2) }}</code></pre>
+		</div>
+	</section>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faTimes, faBookmark, faKey, faSync, faMicrophoneSlash, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake, faTrashAlt, faBookmark as farBookmark  } from '@fortawesome/free-regular-svg-icons';
+import MkButton from '../../components/ui/button.vue';
+import MkSwitch from '../../components/ui/switch.vue';
+import i18n from '../../i18n';
+import Progress from '../../scripts/loading';
+
+export default Vue.extend({
+	i18n,
+
+	components: {
+		MkButton,
+		MkSwitch,
+	},
+
+	data() {
+		return {
+			user: null,
+			info: null,
+			moderator: false,
+			silenced: false,
+			suspended: false,
+			faTimes, faBookmark, farBookmark, faKey, faSync, faMicrophoneSlash, faSnowflake, faTrashAlt, faExternalLinkSquareAlt
+		};
+	},
+
+	watch: {
+		$route: 'fetch'
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		async fetch() {
+			Progress.start();
+			this.user = await this.$root.api('users/show', { userId: this.$route.params.user });
+			this.info = await this.$root.api('admin/show-user', { userId: this.$route.params.user });
+			this.moderator = this.info.isModerator;
+			this.silenced = this.info.isSilenced;
+			this.suspended = this.info.isSuspended;
+			Progress.done();
+		},
+
+		/** 処理対象ユーザーの情報を更新する */
+		async refreshUser() {
+			this.user = await this.$root.api('users/show', { userId: this.user.id });
+			this.info = await this.$root.api('admin/show-user', { userId: this.user.id });
+		},
+
+		openProfile() {
+			window.open(Vue.filter('userPage')(this.user, null, true), '_blank');
+		},
+
+		async updateRemoteUser() {
+			await this.$root.api('admin/update-remote-user', { userId: this.user.id }).then(res => {
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			});
+			await this.refreshUser();
+		},
+
+		async resetPassword() {
+			const dialog = this.$root.dialog({
+				type: 'waiting',
+				iconOnly: true
+			});
+
+			this.$root.api('admin/reset-password', {
+				userId: this.user.id,
+			}).then(({ password }) => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('newPasswordIs', { password })
+				});
+			}).catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			}).finally(() => {
+				dialog.close();
+			});
+		},
+
+		async toggleSilence() {
+			const confirm = await this.$root.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				text: this.silenced ? this.$t('silenceConfirm') : this.$t('unsilenceConfirm'),
+			});
+			if (confirm.canceled) {
+				this.silenced = !this.silenced;
+			} else {
+				await this.$root.api(this.silenced ? 'admin/silence-user' : 'admin/unsilence-user', { userId: this.user.id });
+				await this.refreshUser();
+			}
+		},
+
+		async toggleSuspend() {
+			const confirm = await this.$root.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				text: this.suspended ? this.$t('suspendConfirm') : this.$t('unsuspendConfirm'),
+			});
+			if (confirm.canceled) {
+				this.suspended = !this.suspended;
+			} else {
+				await this.$root.api(this.suspended ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: this.user.id });
+				await this.refreshUser();
+			}
+		},
+
+		async toggleModerator() {
+			await this.$root.api(this.moderator ? 'admin/moderators/add' : 'admin/moderators/remove', { userId: this.user.id });
+			await this.refreshUser();
+		},
+
+		async deleteAllFiles() {
+			const confirm = await this.$root.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				text: this.$t('deleteAllFilesConfirm'),
+			});
+			if (confirm.canceled) return;
+			const process = async () => {
+				await this.$root.api('admin/delete-all-files-of-a-user', { userId: this.user.id });
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			};
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+			await this.refreshUser();
+		},
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.vrcsvlkm {
+	display: flex;
+	flex-direction: column;
+
+	> ._card {
+		> .actions {
+			display: flex;
+			box-sizing: border-box;
+			text-align: left;
+			align-items: center;
+			margin-top: 16px;
+			margin-bottom: 16px;
+		}
+
+		> .rawdata {
+			> pre > code {
+				display: block;
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+</style>

src/client/pages/instance/users.vue

@@ -12,19 +12,65 @@
 			<mk-button @click="showUser()" primary><fa :icon="faSearch"/> {{ $t('lookup') }}</mk-button>
 		</div>
 		<div class="_footer">
-			<mk-button inline primary @click="search()"><fa :icon="faSearch"/> {{ $t('search') }}</mk-button>
+			<mk-button inline primary @click="searchUser()"><fa :icon="faSearch"/> {{ $t('search') }}</mk-button>
 		</div>
 	</section>
 
 	<section class="_card users">
 		<div class="_title"><fa :icon="faUsers"/> {{ $t('users') }}</div>
+		<div class="_content">
+			<div class="inputs" style="display: flex;">
+				<mk-select v-model="sort" style="margin: 0; flex: 1;">
+					<template #label>{{ $t('sort') }}</template>
+					<option value="-createdAt">{{ $t('registeredDate') }} ({{ $t('ascendingOrder') }})</option>
+					<option value="+createdAt">{{ $t('registeredDate') }} ({{ $t('descendingOrder') }})</option>
+					<option value="-updatedAt">{{ $t('lastUsed') }} ({{ $t('ascendingOrder') }})</option>
+					<option value="+updatedAt">{{ $t('lastUsed') }} ({{ $t('descendingOrder') }})</option>
+				</mk-select>
+				<mk-select v-model="state" style="margin: 0; flex: 1;">
+					<template #label>{{ $t('state') }}</template>
+					<option value="all">{{ $t('all') }}</option>
+					<option value="available">{{ $t('normal') }}</option>
+					<option value="admin">{{ $t('administrator') }}</option>
+					<option value="moderator">{{ $t('moderator') }}</option>
+					<option value="silenced">{{ $t('silence') }}</option>
+					<option value="suspended">{{ $t('suspend') }}</option>
+				</mk-select>
+				<mk-select v-model="origin" style="margin: 0; flex: 1;">
+					<template #label>{{ $t('instance') }}</template>
+					<option value="combined">{{ $t('all') }}</option>
+					<option value="local">{{ $t('local') }}</option>
+					<option value="remote">{{ $t('remote') }}</option>
+				</mk-select>
+			</div>
+			<div class="inputs" style="display: flex; padding-top: 1.2em;">
+				<mk-input v-model="searchUsername" style="margin: 0; flex: 1;" type="text" spellcheck="false" @input="$refs.users.reload()">
+					<span>{{ $t('username') }}</span>
+				</mk-input>
+				<mk-input v-model="searchHost" style="margin: 0; flex: 1;" type="text" spellcheck="false" @input="$refs.users.reload()" :disabled="pagination.params().origin === 'local'">
+					<span>{{ $t('host') }}</span>
+				</mk-input>
+			</div>
+		</div>
 		<div class="_content _list">
 			<mk-pagination :pagination="pagination" #default="{items}" class="users" ref="users" :auto-margin="false">
 				<button class="user _button _listItem" v-for="(user, i) in items" :key="user.id" @click="show(user)">
-					<mk-avatar :user="user" class="avatar"/>
+					<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 					<div class="body">
-						<mk-user-name :user="user" class="name"/>
-						<mk-acct :user="user" class="acct"/>
+						<header>
+							<mk-user-name class="name" :user="user"/>
+							<span class="acct">@{{ user | acct }}</span>
+							<span class="staff" v-if="user.isAdmin"><fa :icon="faBookmark"/></span>
+							<span class="staff" v-if="user.isModerator"><fa :icon="farBookmark"/></span>
+							<span class="punished" v-if="user.isSilenced"><fa :icon="faMicrophoneSlash"/></span>
+							<span class="punished" v-if="user.isSuspended"><fa :icon="faSnowflake"/></span>
+						</header>
+						<div>
+							<span>{{ $t('lastUsed') }}: <mk-time :time="user.updatedAt" mode="detail"/></span>
+						</div>
+						<div>
+							<span>{{ $t('registeredDate') }}: <mk-time :time="user.createdAt" mode="detail"/></span>
+						</div>
 					</div>
 				</button>
 			</mk-pagination>
@@ -38,12 +84,13 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faPlus, faUsers, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
+import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
 import parseAcct from '../../../misc/acct/parse';
 import MkButton from '../../components/ui/button.vue';
 import MkInput from '../../components/ui/input.vue';
+import MkSelect from '../../components/ui/select.vue';
 import MkPagination from '../../components/ui/pagination.vue';
-import MkUserModerateDialog from '../../components/user-moderate-dialog.vue';
 import MkUserSelect from '../../components/user-select.vue';
 
 export default Vue.extend({
@@ -56,24 +103,46 @@ export default Vue.extend({
 	components: {
 		MkButton,
 		MkInput,
+		MkSelect,
 		MkPagination,
 	},
 
 	data() {
 		return {
+			target: '',
+			sort: '+createdAt',
+			state: 'all',
+			origin: 'local',
+			searchUsername: '',
+			searchHost: '',
 			pagination: {
 				endpoint: 'admin/show-users',
 				limit: 10,
 				params: () => ({
-					sort: '+createdAt'
+					sort: this.sort,
+					state: this.state,
+					origin: this.origin,
+					username: this.searchUsername,
+					hostname: this.searchHost,
 				}),
 				offsetMode: true
 			},
-			target: '',
-			faPlus, faUsers, faSearch
+			faPlus, faUsers, faSearch, faBookmark, farBookmark, faMicrophoneSlash, faSnowflake
 		}
 	},
 
+	watch: {
+		sort() {
+			this.$refs.users.reload();
+		},
+		state() {
+			this.$refs.users.reload();
+		},
+		origin() {
+			this.$refs.users.reload();
+		},
+	},
+
 	methods: {
 		/** テキストエリアのユーザーを解決する */
 		fetchUser() {
@@ -105,12 +174,16 @@ export default Vue.extend({
 		/** テキストエリアから処理対象ユーザーを設定する */
 		async showUser() {
 			const user = await this.fetchUser();
-			this.$root.api('admin/show-user', { userId: user.id }).then(info => {
-				this.show(user, info);
-			});
+			this.show(user);
 			this.target = '';
 		},
 
+		searchUser() {
+			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+				this.show(user);
+			});
+		},
+
 		async addUser() {
 			const { canceled: canceled1, result: username } = await this.$root.dialog({
 				title: this.$t('username'),
@@ -148,19 +221,8 @@ export default Vue.extend({
 			});
 		},
 
-		async show(user, info) {
-			if (info == null) info = await this.$root.api('admin/show-user', { userId: user.id });
-			this.$root.new(MkUserModerateDialog, {
-				user: { ...user, ...info }
-			});
-		},
-
-		search() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
-				this.$root.api('admin/show-user', { userId: user.id }).then(info => {
-					this.show(user, info);
-				});
-			});
+		async show(user) {
+			this.$router.push('./users/' + user.id);
 		}
 	}
 });
@@ -182,20 +244,38 @@ export default Vue.extend({
 					align-items: center;
 
 					> .avatar {
-						width: 50px;
-						height: 50px;
+						width: 64px;
+						height: 64px;
 					}
 
 					> .body {
+						margin-left: 0.3em;
 						padding: 8px;
+						flex: 1;
 
-						> .name {
-							display: block;
-							font-weight: bold;
+						@media (max-width 500px) {
+							font-size: 14px;
 						}
 
-						> .acct {
-							opacity: 0.5;
+						> header {
+							> .name {
+								font-weight: bold;
+							}
+
+							> .acct {
+								margin-left: 8px;
+								opacity: 0.7;
+							}
+
+							> .staff {
+								margin-left: 0.5em;
+								color: var(--badge);
+							}
+
+							> .punished {
+								margin-left: 0.5em;
+								color: #4dabf7;
+							}
 						}
 					}
 				}

src/client/pages/page-editor/els/page-editor.el.button.vue

@@ -10,6 +10,7 @@
 			<option value="dialog">{{ $t('_pages.blocks._button._action.dialog') }}</option>
 			<option value="resetRandom">{{ $t('_pages.blocks._button._action.resetRandom') }}</option>
 			<option value="pushEvent">{{ $t('_pages.blocks._button._action.pushEvent') }}</option>
+			<option value="callAiScript">{{ $t('_pages.blocks._button._action.callAiScript') }}</option>
 		</mk-select>
 		<template v-if="value.action === 'dialog'">
 			<mk-input v-model="value.content"><span>{{ $t('_pages.blocks._button._action._dialog.content') }}</span></mk-input>
@@ -20,15 +21,18 @@
 			<mk-select v-model="value.var">
 				<template #label>{{ $t('_pages.blocks._button._action._pushEvent.variable') }}</template>
 				<option :value="null">{{ $t('_pages.blocks._button._action._pushEvent.no-variable') }}</option>
-				<option v-for="v in aiScript.getVarsByType()" :value="v.name">{{ v.name }}</option>
+				<option v-for="v in aoiScript.getVarsByType()" :value="v.name">{{ v.name }}</option>
 				<optgroup :label="$t('_pages.script.pageVariables')">
-					<option v-for="v in aiScript.getPageVarsByType()" :value="v">{{ v }}</option>
+					<option v-for="v in aoiScript.getPageVarsByType()" :value="v">{{ v }}</option>
 				</optgroup>
 				<optgroup :label="$t('_pages.script.enviromentVariables')">
-					<option v-for="v in aiScript.getEnvVarsByType()" :value="v">{{ v }}</option>
+					<option v-for="v in aoiScript.getEnvVarsByType()" :value="v">{{ v }}</option>
 				</optgroup>
 			</mk-select>
 		</template>
+		<template v-else-if="value.action === 'callAiScript'">
+			<mk-input v-model="value.fn"><span>{{ $t('_pages.blocks._button._action._callAiScript.functionName') }}</span></mk-input>
+		</template>
 	</section>
 </x-container>
 </template>
@@ -53,7 +57,7 @@ export default Vue.extend({
 		value: {
 			required: true
 		},
-		aiScript: {
+		aoiScript: {
 			required: true,
 		},
 	},
@@ -72,6 +76,7 @@ export default Vue.extend({
 		if (this.value.message == null) Vue.set(this.value, 'message', null);
 		if (this.value.primary == null) Vue.set(this.value, 'primary', false);
 		if (this.value.var == null) Vue.set(this.value, 'var', null);
+		if (this.value.fn == null) Vue.set(this.value, 'fn', null);
 	},
 });
 </script>

src/client/pages/page-editor/els/page-editor.el.canvas.vue

@@ -0,0 +1,45 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faPaintBrush"/> {{ $t('_pages.blocks.canvas') }}</template>
+
+	<section style="padding: 0 16px 0 16px;">
+		<mk-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('_pages.blocks._canvas.id') }}</span></mk-input>
+		<mk-input v-model="value.width" type="number"><span>{{ $t('_pages.blocks._canvas.width') }}</span><template #suffix>px</template></mk-input>
+		<mk-input v-model="value.height" type="number"><span>{{ $t('_pages.blocks._canvas.height') }}</span><template #suffix>px</template></mk-input>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faPaintBrush, faMagic } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../i18n';
+import XContainer from '../page-editor.container.vue';
+import MkInput from '../../../components/ui/input.vue';
+
+export default Vue.extend({
+	i18n,
+
+	components: {
+		XContainer, MkInput
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			faPaintBrush, faMagic
+		};
+	},
+
+	created() {
+		if (this.value.name == null) Vue.set(this.value, 'name', '');
+		if (this.value.width == null) Vue.set(this.value, 'width', 300);
+		if (this.value.height == null) Vue.set(this.value, 'height', 200);
+	},
+});
+</script>

src/client/pages/page-editor/els/page-editor.el.if.vue

@@ -2,7 +2,7 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faQuestion"/> {{ $t('_pages.blocks.if') }}</template>
 	<template #func>
-		<button @click="add()">
+		<button @click="add()" class="_button">
 			<fa :icon="faPlus"/>
 		</button>
 	</template>
@@ -10,16 +10,16 @@
 	<section class="romcojzs">
 		<mk-select v-model="value.var">
 			<template #label>{{ $t('_pages.blocks._if.variable') }}</template>
-			<option v-for="v in aiScript.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option>
+			<option v-for="v in aoiScript.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option>
 			<optgroup :label="$t('_pages.script.pageVariables')">
-				<option v-for="v in aiScript.getPageVarsByType('boolean')" :value="v">{{ v }}</option>
+				<option v-for="v in aoiScript.getPageVarsByType('boolean')" :value="v">{{ v }}</option>
 			</optgroup>
 			<optgroup :label="$t('_pages.script.enviromentVariables')">
-				<option v-for="v in aiScript.getEnvVarsByType('boolean')" :value="v">{{ v }}</option>
+				<option v-for="v in aoiScript.getEnvVarsByType('boolean')" :value="v">{{ v }}</option>
 			</optgroup>
 		</mk-select>
 
-		<x-blocks class="children" v-model="value.children" :ai-script="aiScript"/>
+		<x-blocks class="children" v-model="value.children" :aoi-script="aoiScript"/>
 	</section>
 </x-container>
 </template>
@@ -45,7 +45,7 @@ export default Vue.extend({
 		value: {
 			required: true
 		},
-		aiScript: {
+		aoiScript: {
 			required: true,
 		},
 	},

src/client/pages/page-editor/els/page-editor.el.post.vue

@@ -2,8 +2,10 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faPaperPlane"/> {{ $t('_pages.blocks.post') }}</template>
 
-	<section style="padding: 0 16px 16px 16px;">
+	<section style="padding: 16px;">
 		<mk-textarea v-model="value.text">{{ $t('_pages.blocks._post.text') }}</mk-textarea>
+		<mk-switch v-model="value.attachCanvasImage"><span>{{ $t('_pages.blocks._post.attachCanvasImage') }}</span></mk-switch>
+		<mk-input v-if="value.attachCanvasImage" v-model="value.canvasId"><span>{{ $t('_pages.blocks._post.canvasId') }}</span></mk-input>
 	</section>
 </x-container>
 </template>
@@ -14,12 +16,14 @@ import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../../../i18n';
 import XContainer from '../page-editor.container.vue';
 import MkTextarea from '../../../components/ui/textarea.vue';
+import MkInput from '../../../components/ui/input.vue';
+import MkSwitch from '../../../components/ui/switch.vue';
 
 export default Vue.extend({
 	i18n,
 
 	components: {
-		XContainer, MkTextarea
+		XContainer, MkTextarea, MkInput, MkSwitch
 	},
 
 	props: {
@@ -36,6 +40,8 @@ export default Vue.extend({
 
 	created() {
 		if (this.value.text == null) Vue.set(this.value, 'text', '');
+		if (this.value.attachCanvasImage == null) Vue.set(this.value, 'attachCanvasImage', false);
+		if (this.value.canvasId == null) Vue.set(this.value, 'canvasId', '');
 	},
 });
 </script>

src/client/pages/page-editor/els/page-editor.el.section.vue

@@ -2,16 +2,16 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faStickyNote"/> {{ value.title }}</template>
 	<template #func>
-		<button @click="rename()">
+		<button @click="rename()" class="_button">
 			<fa :icon="faPencilAlt"/>
 		</button>
-		<button @click="add()">
+		<button @click="add()" class="_button">
 			<fa :icon="faPlus"/>
 		</button>
 	</template>
 
 	<section class="ilrvjyvi">
-		<x-blocks class="children" v-model="value.children" :ai-script="aiScript"/>
+		<x-blocks class="children" v-model="value.children" :aoi-script="aoiScript"/>
 	</section>
 </x-container>
 </template>
@@ -37,7 +37,7 @@ export default Vue.extend({
 		value: {
 			required: true
 		},
-		aiScript: {
+		aoiScript: {
 			required: true,
 		},
 	},

src/client/pages/page-editor/els/page-editor.el.text.vue

@@ -2,7 +2,7 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faAlignLeft"/> {{ $t('_pages.blocks.text') }}</template>
 
-	<section class="ihymsbbe">
+	<section class="vckmsadr">
 		<textarea v-model="value.text"></textarea>
 	</section>
 </x-container>
@@ -40,7 +40,7 @@ export default Vue.extend({
 </script>
 
 <style lang="scss" scoped>
-.ihymsbbe {
+.vckmsadr {
 	> textarea {
 		display: block;
 		-webkit-appearance: none;
@@ -55,6 +55,7 @@ export default Vue.extend({
 		background: transparent;
 		color: var(--fg);
 		font-size: 14px;
+		box-sizing: border-box;
 	}
 }
 </style>

src/client/pages/page-editor/els/page-editor.el.textarea.vue

@@ -55,6 +55,7 @@ export default Vue.extend({
 		background: transparent;
 		color: var(--fg);
 		font-size: 14px;
+		box-sizing: border-box;
 	}
 }
 </style>

src/client/pages/page-editor/page-editor.blocks.vue

@@ -1,6 +1,6 @@
 <template>
 <x-draggable tag="div" :list="blocks" handle=".drag-handle" :group="{ name: 'blocks' }" animation="150" swap-threshold="0.5">
-	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="() => removeItem(block)" :key="block.id" :ai-script="aiScript"/>
+	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="() => removeItem(block)" :key="block.id" :aoi-script="aoiScript"/>
 </x-draggable>
 </template>
 
@@ -20,10 +20,11 @@ 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';
+import XCanvas from './els/page-editor.el.canvas.vue';
 
 export default Vue.extend({
 	components: {
-		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter, XRadioButton
+		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter, XRadioButton, XCanvas
 	},
 
 	props: {
@@ -31,7 +32,7 @@ export default Vue.extend({
 			type: Array,
 			required: true
 		},
-		aiScript: {
+		aoiScript: {
 			required: true,
 		},
 	},

src/client/pages/page-editor/page-editor.container.vue

@@ -18,7 +18,7 @@
 	</header>
 	<p v-show="showBody" class="error" v-if="error != null">{{ $t('_pages.script.typeError', { slot: error.arg + 1, expect: $t(`script.types.${error.expect}`), actual: $t(`script.types.${error.actual}`) }) }}</p>
 	<p v-show="showBody" class="warn" v-if="warn != null">{{ $t('_pages.script.thereIsEmptySlot', { slot: warn.slot + 1 }) }}</p>
-	<div v-show="showBody">
+	<div v-show="showBody" class="body">
 		<slot></slot>
 	</div>
 </div>
@@ -148,5 +148,17 @@ export default Vue.extend({
 		padding: 16px 16px 0 16px;
 		font-size: 14px;
 	}
+
+	> .body {
+		::v-deep .juejbjww, ::v-deep .eiipwacr {
+			&:not(.inline):first-child {
+				margin-top: 28px;
+			}
+
+			&:not(.inline):last-child {
+				margin-bottom: 20px;
+			}
+		}
+	}
 }
 </style>

src/client/pages/page-editor/page-editor.script-block.vue

@@ -2,7 +2,7 @@
 <x-container :removable="removable" @remove="() => $emit('remove')" :error="error" :warn="warn" :draggable="draggable">
 	<template #header><fa v-if="icon" :icon="icon"/> <template v-if="title">{{ title }} <span class="turmquns" v-if="typeText">({{ typeText }})</span></template><template v-else-if="typeText">{{ typeText }}</template></template>
 	<template #func>
-		<button @click="changeType()">
+		<button @click="changeType()" class="_button">
 			<fa :icon="faPencilAlt"/>
 		</button>
 	</template>
@@ -24,30 +24,33 @@
 	</section>
 	<section v-else-if="value.type === 'ref'" class="hpdwcrvs">
 		<select v-model="value.value">
-			<option v-for="v in aiScript.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option>
+			<option v-for="v in aoiScript.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option>
 			<optgroup :label="$t('_pages.script.argVariables')">
 				<option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option>
 			</optgroup>
 			<optgroup :label="$t('_pages.script.pageVariables')">
-				<option v-for="v in aiScript.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
+				<option v-for="v in aoiScript.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
 			</optgroup>
 			<optgroup :label="$t('_pages.script.enviromentVariables')">
-				<option v-for="v in aiScript.getEnvVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
+				<option v-for="v in aoiScript.getEnvVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
 			</optgroup>
 		</select>
 	</section>
+	<section v-else-if="value.type === 'aiScriptVar'" class="tbwccoaw">
+		<input v-model="value.value"/>
+	</section>
 	<section v-else-if="value.type === 'fn'" class="" style="padding:0 16px 16px 16px;">
 		<mk-textarea v-model="slots">
 			<span>{{ $t('_pages.script.blocks._fn.slots') }}</span>
 			<template #desc>{{ $t('_pages.script.blocks._fn.slots-info') }}</template>
 		</mk-textarea>
-		<x-v v-if="value.value.expression" v-model="value.value.expression" :title="$t(`_pages.script.blocks._fn.arg1`)" :get-expected-type="() => null" :ai-script="aiScript" :fn-slots="value.value.slots" :name="name"/>
+		<x-v v-if="value.value.expression" v-model="value.value.expression" :title="$t(`_pages.script.blocks._fn.arg1`)" :get-expected-type="() => null" :aoi-script="aoiScript" :fn-slots="value.value.slots" :name="name"/>
 	</section>
 	<section v-else-if="value.type.startsWith('fn:')" class="" style="padding:16px;">
-		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="aiScript.getVarByName(value.type.split(':')[1]).value.slots[i].name" :get-expected-type="() => null" :ai-script="aiScript" :name="name" :key="i"/>
+		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="aoiScript.getVarByName(value.type.split(':')[1]).value.slots[i].name" :get-expected-type="() => null" :aoi-script="aoiScript" :name="name" :key="i"/>
 	</section>
 	<section v-else class="" style="padding:16px;">
-		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="$t(`_pages.script.blocks._${value.type}.arg${i + 1}`)" :get-expected-type="() => _getExpectedType(i)" :ai-script="aiScript" :name="name" :fn-slots="fnSlots" :key="i"/>
+		<x-v v-for="(x, i) in value.args" v-model="value.args[i]" :title="$t(`_pages.script.blocks._${value.type}.arg${i + 1}`)" :get-expected-type="() => _getExpectedType(i)" :aoi-script="aoiScript" :name="name" :fn-slots="fnSlots" :key="i"/>
 	</section>
 </x-container>
 </template>
@@ -59,7 +62,7 @@ import { v4 as uuid } from 'uuid';
 import i18n from '../../i18n';
 import XContainer from './page-editor.container.vue';
 import MkTextarea from '../../components/ui/textarea.vue';
-import { isLiteralBlock, funcDefs, blockDefs } from '../../scripts/aiscript/index';
+import { isLiteralBlock, funcDefs, blockDefs } from '../../scripts/aoiscript/index';
 
 export default Vue.extend({
 	i18n,
@@ -85,7 +88,7 @@ export default Vue.extend({
 			required: false,
 			default: false
 		},
-		aiScript: {
+		aoiScript: {
 			required: true,
 		},
 		name: {
@@ -153,7 +156,7 @@ export default Vue.extend({
 
 			if (this.value.type && this.value.type.startsWith('fn:')) {
 				const fnName = this.value.type.split(':')[1];
-				const fn = this.aiScript.getVarByName(fnName);
+				const fn = this.aoiScript.getVarByName(fnName);
 
 				const empties = [];
 				for (let i = 0; i < fn.value.slots.length; i++) {
@@ -199,9 +202,9 @@ export default Vue.extend({
 			deep: true
 		});
 
-		this.$watch('aiScript.variables', () => {
+		this.$watch('aoiScript.variables', () => {
 			if (this.type != null && this.value) {
-				this.error = this.aiScript.typeCheck(this.value);
+				this.error = this.aoiScript.typeCheck(this.value);
 			}
 		}, {
 			deep: true
@@ -223,7 +226,7 @@ export default Vue.extend({
 		},
 
 		_getExpectedType(slot: number) {
-			return this.aiScript.getExpectedType(this.value, slot);
+			return this.aoiScript.getExpectedType(this.value, slot);
 		}
 	}
 });
@@ -258,6 +261,7 @@ export default Vue.extend({
 		font-size: 16px;
 		background: transparent;
 		color: var(--fg);
+		box-sizing: border-box;
 	}
 
 	> textarea {

src/client/pages/page-editor/page-editor.vue

@@ -46,7 +46,7 @@
 				</div>
 			</template>
 
-			<x-blocks class="content" v-model="content" :ai-script="aiScript"/>
+			<x-blocks class="content" v-model="content" :aoi-script="aoiScript"/>
 
 			<mk-button @click="add()" v-if="!readonly"><fa :icon="faPlus"/></mk-button>
 		</section>
@@ -62,7 +62,7 @@
 					@input="v => updateVariable(v)"
 					@remove="() => removeVariable(variable)"
 					:key="variable.name"
-					:ai-script="aiScript"
+					:aoi-script="aoiScript"
 					:name="variable.name"
 					:title="variable.name"
 					:draggable="true"
@@ -73,11 +73,10 @@
 		</div>
 	</mk-container>
 
-	<mk-container :body-togglable="true" :expanded="false">
-		<template #header><fa :icon="faCode"/> {{ $t('_pages.inspector') }}</template>
-		<div style="padding:0 32px 32px 32px;">
-			<mk-textarea :value="JSON.stringify(content, null, 2)" readonly tall>{{ $t('_pages.content') }}</mk-textarea>
-			<mk-textarea :value="JSON.stringify(variables, null, 2)" readonly tall>{{ $t('_pages.variables') }}</mk-textarea>
+	<mk-container :body-togglable="true" :expanded="true">
+		<template #header><fa :icon="faCode"/> {{ $t('script') }}</template>
+		<div>
+			<prism-editor v-model="script" :line-numbers="false" language="js"/>
 		</div>
 	</mk-container>
 </div>
@@ -86,6 +85,9 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as XDraggable from 'vuedraggable';
+import "prismjs";
+import 'prismjs/themes/prism-okaidia.css';
+import PrismEditor from 'vue-prism-editor';
 import { faICursor, faPlus, faMagic, faCog, faCode, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import { v4 as uuid } from 'uuid';
@@ -98,8 +100,8 @@ import MkButton from '../../components/ui/button.vue';
 import MkSelect from '../../components/ui/select.vue';
 import MkSwitch from '../../components/ui/switch.vue';
 import MkInput from '../../components/ui/input.vue';
-import { blockDefs } from '../../scripts/aiscript/index';
-import { ASTypeChecker } from '../../scripts/aiscript/type-checker';
+import { blockDefs } from '../../scripts/aoiscript/index';
+import { ASTypeChecker } from '../../scripts/aoiscript/type-checker';
 import { url } from '../../config';
 import { collectPageVars } from '../../scripts/collect-page-vars';
 import { selectDriveFile } from '../../scripts/select-drive-file';
@@ -108,7 +110,7 @@ export default Vue.extend({
 	i18n,
 
 	components: {
-		XDraggable, XVariable, XBlocks, MkTextarea, MkContainer, MkButton, MkSelect, MkSwitch, MkInput
+		XDraggable, XVariable, XBlocks, MkTextarea, MkContainer, MkButton, MkSelect, MkSwitch, MkInput, PrismEditor
 	},
 
 	props: {
@@ -143,7 +145,8 @@ export default Vue.extend({
 			alignCenter: false,
 			hideTitleWhenPinned: false,
 			variables: [],
-			aiScript: null,
+			aoiScript: null,
+			script: '',
 			showOptions: false,
 			url,
 			faPlus, faICursor, faSave, faStickyNote, faMagic, faCog, faTrashAlt, faExternalLinkSquareAlt, faCode
@@ -163,14 +166,14 @@ export default Vue.extend({
 	},
 
 	async created() {
-		this.aiScript = new ASTypeChecker();
+		this.aoiScript = new ASTypeChecker();
 
 		this.$watch('variables', () => {
-			this.aiScript.variables = this.variables;
+			this.aoiScript.variables = this.variables;
 		}, { deep: true });
 
 		this.$watch('content', () => {
-			this.aiScript.pageVars = collectPageVars(this.content);
+			this.aoiScript.pageVars = collectPageVars(this.content);
 		}, { deep: true });
 
 		if (this.initPageId) {
@@ -193,6 +196,7 @@ export default Vue.extend({
 			this.currentName = this.page.name;
 			this.summary = this.page.summary;
 			this.font = this.page.font;
+			this.script = this.page.script;
 			this.hideTitleWhenPinned = this.page.hideTitleWhenPinned;
 			this.alignCenter = this.page.alignCenter;
 			this.content = this.page.content;
@@ -223,6 +227,7 @@ export default Vue.extend({
 				name: this.name.trim(),
 				summary: this.summary,
 				font: this.font,
+				script: this.script,
 				hideTitleWhenPinned: this.hideTitleWhenPinned,
 				alignCenter: this.alignCenter,
 				content: this.content,
@@ -317,7 +322,7 @@ export default Vue.extend({
 
 			name = name.trim();
 
-			if (this.aiScript.isUsedName(name)) {
+			if (this.aoiScript.isUsedName(name)) {
 				this.$root.dialog({
 					type: 'error',
 					text: this.$t('_pages.variableNameIsAlreadyUsed')
@@ -346,6 +351,7 @@ export default Vue.extend({
 					{ value: 'text', text: this.$t('_pages.blocks.text') },
 					{ value: 'image', text: this.$t('_pages.blocks.image') },
 					{ value: 'textarea', text: this.$t('_pages.blocks.textarea') },
+					{ value: 'canvas', text: this.$t('_pages.blocks.canvas') },
 				]
 			}, {
 				label: this.$t('_pages.inputBlocks'),
@@ -382,7 +388,7 @@ export default Vue.extend({
 				} else {
 					list.push({
 						category: block.category,
-						label: this.$t(`script.categories.${block.category}`),
+						label: this.$t(`_pages.script.categories.${block.category}`),
 						items: [{
 							value: block.type,
 							text: this.$t(`_pages.script.blocks.${block.type}`)
@@ -394,7 +400,7 @@ export default Vue.extend({
 			const userFns = this.variables.filter(x => x.type === 'fn');
 			if (userFns.length > 0) {
 				list.unshift({
-					label: this.$t(`script.categories.fn`),
+					label: this.$t(`_pages.script.categories.fn`),
 					items: userFns.map(v => ({
 						value: 'fn:' + v.name,
 						text: v.name
@@ -423,8 +429,6 @@ export default Vue.extend({
 	margin-bottom: var(--margin);
 
 	> header {
-		background: var(--faceHeader);
-
 		> .title {
 			z-index: 1;
 			margin: 0;
@@ -432,8 +436,7 @@ export default Vue.extend({
 			line-height: 42px;
 			font-size: 0.9em;
 			font-weight: bold;
-			color: var(--faceHeaderText);
-			box-shadow: 0 var(--lineWidth) rgba(#000, 0.07);
+			box-shadow: 0 1px rgba(#000, 0.07);
 
 			> [data-icon] {
 				margin-right: 6px;

src/client/pages/page.vue

@@ -5,7 +5,9 @@
 
 	<div class="_card" v-if="page" :key="page.id">
 		<div class="_title">{{ page.title }}</div>
-		<img class="header" :src="page.eyeCatchingImage.url" v-if="page.eyeCatchingImageId" />
+		<div class="banner">
+			<img :src="page.eyeCatchingImage.url" v-if="page.eyeCatchingImageId"/>
+		</div>
 		<div class="_content">
 			<x-page :page="page"/>
 		</div>
@@ -116,8 +118,21 @@ export default Vue.extend({
 
 <style lang="scss" scoped>
 .xcukqgmh {
-	> ._card > .header {
-		max-width: 100%;
+	> ._card {
+		> .banner {
+			> img {
+				display: block;
+				width: 100%;
+				height: 120px;
+				object-fit: cover;
+			}
+		}
+
+		> ._footer {
+			> * {
+				margin: 0 0.5em;
+			}
+		}
 	}
 }
 </style>

src/client/pages/preferences/index.vue

@@ -65,6 +65,7 @@
 				<template #desc><mfm text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></template>
 			</mk-switch>
 			<mk-switch v-model="showFixedPostForm">{{ $t('showFixedPostForm') }}</mk-switch>
+			<mk-switch v-model="disablePagesScript">{{ $t('disablePagesScript') }}</mk-switch>
 		</div>
 		<div class="_content">
 			<mk-select v-model="lang">
@@ -171,6 +172,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'imageNewTab', value }); }
 		},
 
+		disablePagesScript: {
+			get() { return this.$store.state.device.disablePagesScript; },
+			set(value) { this.$store.commit('device/set', { key: 'disablePagesScript', value }); }
+		},
+
 		showFixedPostForm: {
 			get() { return this.$store.state.device.showFixedPostForm; },
 			set(value) { this.$store.commit('device/set', { key: 'showFixedPostForm', value }); }

src/client/pages/scratchpad.vue

@@ -23,14 +23,15 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import "prismjs";
-import "prismjs/themes/prism.css";
 import { faTerminal, faPlay } from '@fortawesome/free-solid-svg-icons';
+import "prismjs";
+import 'prismjs/themes/prism-okaidia.css';
 import PrismEditor from 'vue-prism-editor';
 import { AiScript, parse, utils, values } from '@syuilo/aiscript';
 import i18n from '../i18n';
 import MkContainer from '../components/ui/container.vue';
 import MkButton from '../components/ui/button.vue';
+import { createAiScriptEnv } from '../scripts/create-aiscript-env';
 
 export default Vue.extend({
 	i18n,
@@ -71,24 +72,9 @@ export default Vue.extend({
 	methods: {
 		async run() {
 			this.logs = [];
-			const aiscript = new AiScript({
-				dialog: values.FN_NATIVE(async ([title, text, type]) => {
-					await this.$root.dialog({
-						type: type ? type.value : 'info',
-						title: title.value,
-						text: text.value,
-					});
-				}),
-				confirm: values.FN_NATIVE(async ([title, text]) => {
-					const confirm = await this.$root.dialog({
-						type: 'warning',
-						showCancelButton: true,
-						title: title.value,
-						text: text.value,
-					});
-					return confirm.canceled ? values.FALSE : values.TRUE
-				}),
-			}, {
+			const aiscript = new AiScript(createAiScriptEnv(this, {
+				storageKey: 'scratchpad'
+			}), {
 				in: (q) => {
 					return new Promise(ok => {
 						this.$root.dialog({

src/client/pages/user/index.photos.vue

@@ -8,7 +8,7 @@
 			:href="image.note | notePage"
 		></a>
 	</div>
-	<p class="empty" v-if="!fetching && images.length == 0">{{ $t('no-photos') }}</p>
+	<p class="empty" v-if="!fetching && images.length == 0">{{ $t('nothing') }}</p>
 </div>
 </template>
 

src/client/pages/user/index.vue

@@ -2,8 +2,10 @@
 <div class="mk-user-page" v-if="user">
 	<portal to="title" v-if="user"><mk-user-name :user="user" :nowrap="false" class="name"/></portal>
 	<portal to="avatar" v-if="user"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
-	
+
 	<mk-remote-caution v-if="user.host != null" :href="user.url" style="margin-bottom: var(--margin)"/>
+	<div class="punished _panel" v-if="user.isSuspended"><fa :icon="faExclamationTriangle" style="margin-right: 8px;"/> {{ $t('userSuspended') }}</div>
+	<div class="punished _panel" v-if="user.isSilenced"><fa :icon="faExclamationTriangle" style="margin-right: 8px;"/> {{ $t('userSilenced') }}</div>
 	<div class="profile _panel" :key="user.id">
 		<div class="banner-container" :style="style">
 			<div class="banner" ref="banner" :style="style"></div>
@@ -105,7 +107,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faEllipsisH, faRobot, faLock, faBookmark, faChartBar, faImage, faBirthdayCake, faMapMarker } from '@fortawesome/free-solid-svg-icons';
+import { faExclamationTriangle, faEllipsisH, faRobot, faLock, faBookmark, faChartBar, faImage, faBirthdayCake, faMapMarker } from '@fortawesome/free-solid-svg-icons';
 import { faCalendarAlt, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
 import * as age from 's-age';
 import XUserTimeline from './index.timeline.vue';
@@ -139,7 +141,7 @@ export default Vue.extend({
 			user: null,
 			error: null,
 			parallaxAnimationId: null,
-			faEllipsisH, faRobot, faLock, faBookmark, farBookmark, faChartBar, faImage, faBirthdayCake, faMapMarker, faCalendarAlt
+			faExclamationTriangle, faEllipsisH, faRobot, faLock, faBookmark, farBookmark, faChartBar, faImage, faBirthdayCake, faMapMarker, faCalendarAlt
 		};
 	},
 
@@ -217,6 +219,12 @@ export default Vue.extend({
 
 <style lang="scss" scoped>
 .mk-user-page {
+
+	> .punished {
+		font-size: 0.8em;
+		padding: 16px;
+	}
+
 	> .profile {
 		position: relative;
 		margin-bottom: var(--margin);

src/client/router.ts

@@ -52,6 +52,7 @@ export const router = new VueRouter({
 		{ path: '/instance', component: page('instance/index') },
 		{ path: '/instance/emojis', component: page('instance/emojis') },
 		{ path: '/instance/users', component: page('instance/users') },
+		{ path: '/instance/users/:user', component: page('instance/users.user') },
 		{ path: '/instance/files', component: page('instance/files') },
 		{ path: '/instance/queue', component: page('instance/queue') },
 		{ path: '/instance/settings', component: page('instance/settings') },

src/client/scripts/aoiscript/evaluator.ts

@@ -1,7 +1,24 @@
 import autobind from 'autobind-decorator';
 import * as seedrandom from 'seedrandom';
+import Chart from 'chart.js';
+import * as tinycolor from 'tinycolor2';
 import { Variable, PageVar, envVarsDef, funcDefs, Block, isFnBlock } from '.';
 import { version } from '../../config';
+import { AiScript, utils, parse, values } from '@syuilo/aiscript';
+import { createAiScriptEnv } from '../create-aiscript-env';
+
+// https://stackoverflow.com/questions/38493564/chart-area-background-color-chartjs
+Chart.pluginService.register({
+	beforeDraw: function (chart, easing) {
+			if (chart.config.options.chartArea && chart.config.options.chartArea.backgroundColor) {
+					var ctx = chart.chart.ctx;
+					ctx.save();
+					ctx.fillStyle = chart.config.options.chartArea.backgroundColor;
+					ctx.fillRect(0, 0, chart.chart.width, chart.chart.height);
+					ctx.restore();
+			}
+	}
+});
 
 type Fn = {
 	slots: string[];
@@ -9,22 +26,150 @@ type Fn = {
 };
 
 /**
- * AiScript evaluator
+ * AoiScript evaluator
  */
 export class ASEvaluator {
 	private variables: Variable[];
 	private pageVars: PageVar[];
 	private envVars: Record<keyof typeof envVarsDef, any>;
+	public aiscript?: AiScript;
+	private pageVarUpdatedCallback;
+	public canvases: Record<string, HTMLCanvasElement> = {};
 
 	private opts: {
 		randomSeed: string; visitor?: any; page?: any; url?: string;
+		enableAiScript: boolean;
 	};
 
-	constructor(variables: Variable[], pageVars: PageVar[], opts: ASEvaluator['opts']) {
+	constructor(vm: any, variables: Variable[], pageVars: PageVar[], opts: ASEvaluator['opts']) {
 		this.variables = variables;
 		this.pageVars = pageVars;
 		this.opts = opts;
 
+		if (this.opts.enableAiScript) {
+			this.aiscript = new AiScript({ ...createAiScriptEnv(vm, {
+				storageKey: 'pages:' + opts.page.id
+			}), ...{
+				'MkPages:updated': values.FN_NATIVE(([callback]) => {
+					this.pageVarUpdatedCallback = callback;
+				}),
+				'MkPages:get_canvas': values.FN_NATIVE(([id]) => {
+					utils.assertString(id);
+					const canvas = this.canvases[id.value];
+					const ctx = canvas.getContext('2d');
+					return values.OBJ(new Map([
+						['clear_rect', values.FN_NATIVE(([x, y, width, height]) => { ctx.clearRect(x.value, y.value, width.value, height.value) })],
+						['fill_rect', values.FN_NATIVE(([x, y, width, height]) => { ctx.fillRect(x.value, y.value, width.value, height.value) })],
+						['stroke_rect', values.FN_NATIVE(([x, y, width, height]) => { ctx.strokeRect(x.value, y.value, width.value, height.value) })],
+						['fill_text', values.FN_NATIVE(([text, x, y, width]) => { ctx.fillText(text.value, x.value, y.value, width ? width.value : undefined) })],
+						['stroke_text', values.FN_NATIVE(([text, x, y, width]) => { ctx.strokeText(text.value, x.value, y.value, width ? width.value : undefined) })],
+						['set_line_width', values.FN_NATIVE(([width]) => { ctx.lineWidth = width.value })],
+						['set_font', values.FN_NATIVE(([font]) => { ctx.font = font.value })],
+						['set_fill_style', values.FN_NATIVE(([style]) => { ctx.fillStyle = style.value })],
+						['set_stroke_style', values.FN_NATIVE(([style]) => { ctx.strokeStyle = style.value })],
+						['begin_path', values.FN_NATIVE(() => { ctx.beginPath() })],
+						['close_path', values.FN_NATIVE(() => { ctx.closePath() })],
+						['move_to', values.FN_NATIVE(([x, y]) => { ctx.moveTo(x.value, y.value) })],
+						['line_to', values.FN_NATIVE(([x, y]) => { ctx.lineTo(x.value, y.value) })],
+						['arc', values.FN_NATIVE(([x, y, radius, startAngle, endAngle]) => { ctx.arc(x.value, y.value, radius.value, startAngle.value, endAngle.value) })],
+						['rect', values.FN_NATIVE(([x, y, width, height]) => { ctx.rect(x.value, y.value, width.value, height.value) })],
+						['fill', values.FN_NATIVE(() => { ctx.fill() })],
+						['stroke', values.FN_NATIVE(() => { ctx.stroke() })],
+					]));
+				}),
+				'MkPages:chart': values.FN_NATIVE(([id, opts]) => {
+					utils.assertString(id);
+					utils.assertObject(opts);
+					const canvas = this.canvases[id.value];
+					const color = getComputedStyle(document.documentElement).getPropertyValue('--accent');
+					const chart = new Chart(canvas, {
+						type: opts.value.get('type').value,
+						data: {
+							labels: opts.value.get('labels').value.map(x => x.value),
+							datasets: opts.value.get('datasets').value.map(x => ({
+								label: x.value.has('label') ? x.value.get('label').value : '',
+								data: x.value.get('data').value.map(x => x.value),
+								pointRadius: 0,
+								lineTension: 0,
+								borderWidth: 2,
+								borderColor: x.value.has('color') ? x.value.get('color') : color,
+								backgroundColor: tinycolor(x.value.has('color') ? x.value.get('color') : color).setAlpha(0.1).toRgbString(),
+							}))
+						},
+						options: {
+							responsive: false,
+							devicePixelRatio: 1.5,
+							title: {
+								display: opts.value.has('title'),
+								text: opts.value.has('title') ? opts.value.get('title').value : '',
+								fontSize: 14,
+							},
+							layout: {
+								padding: {
+									left: 32,
+									right: 32,
+									top: opts.value.has('title') ? 16 : 32,
+									bottom: 16
+								}
+							},
+							legend: {
+								display: opts.value.get('datasets').value.filter(x => x.value.has('label') && x.value.get('label').value).length === 0 ? false : true,
+								position: 'bottom',
+								labels: {
+									boxWidth: 16,
+								}
+							},
+							tooltips: {
+								enabled: false,
+							},
+							chartArea: {
+								backgroundColor: '#fff'
+							},
+							...(opts.value.get('type').value === 'radar' ? {
+								scale: {
+									ticks: {
+										display: opts.value.has('show_tick_label') ? opts.value.get('show_tick_label').value : false,
+										min: opts.value.has('min') ? opts.value.get('min').value : undefined,
+										max: opts.value.has('max') ? opts.value.get('max').value : undefined,
+										maxTicksLimit: 8,
+									},
+									pointLabels: {
+										fontSize: 12
+									}
+								}
+							} : {
+								scales: {
+									yAxes: [{
+										ticks: {
+											display: opts.value.has('show_tick_label') ? opts.value.get('show_tick_label').value : true,
+											min: opts.value.has('min') ? opts.value.get('min').value : undefined,
+											max: opts.value.has('max') ? opts.value.get('max').value : undefined,
+										}
+									}]
+								}
+							})
+						}
+					});
+				}),
+			}}, {
+				in: (q) => {
+					return new Promise(ok => {
+						vm.$root.dialog({
+							title: q,
+							input: {}
+						}).then(({ canceled, result: a }) => {
+							ok(a);
+						});
+					});
+				},
+				out: (value) => {
+					console.log(value);
+				},
+				log: (type, params) => {
+				},
+			});
+		}
+
 		const date = new Date();
 
 		this.envVars = {
@@ -41,17 +186,25 @@ export class ASEvaluator {
 			IS_CAT: opts.visitor ? opts.visitor.isCat : false,
 			SEED: opts.randomSeed ? opts.randomSeed : '',
 			YMD: `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`,
+			AISCRIPT_DISABLED: !this.opts.enableAiScript,
 			NULL: null
 		};
 	}
 
+	public registerCanvas(id: string, canvas: any) {
+		this.canvases[id] = canvas;
+	}
+
 	@autobind
 	public updatePageVar(name: string, value: any) {
 		const pageVar = this.pageVars.find(v => v.name === name);
 		if (pageVar !== undefined) {
 			pageVar.value = value;
+			if (this.pageVarUpdatedCallback) {
+				if (this.aiscript) this.aiscript.execFn(this.pageVarUpdatedCallback, [values.STR(name), utils.jsToVal(value)]);
+			}
 		} else {
-			throw new AiScriptError(`No such page var '${name}'`);
+			throw new AoiScriptError(`No such page var '${name}'`);
 		}
 	}
 
@@ -110,6 +263,18 @@ export class ASEvaluator {
 			return scope.getState(block.value);
 		}
 
+		if (block.type === 'aiScriptVar') {
+			if (this.aiscript) {
+				try {
+					return utils.valToJs(this.aiscript.scope.get(block.value));
+				} catch (e) {
+					return null;
+				}
+			} else {
+				return null;
+			}
+		}
+
 		if (isFnBlock(block)) { // ユーザー関数定義
 			return {
 				slots: block.value.slots.map(x => x.name),
@@ -206,14 +371,14 @@ export class ASEvaluator {
 		const fnName = block.type;
 		const fn = (funcs as any)[fnName];
 		if (fn == null) {
-			throw new AiScriptError(`No such function '${fnName}'`);
+			throw new AoiScriptError(`No such function '${fnName}'`);
 		} else {
 			return fn(...block.args.map(x => this.evaluate(x, scope)));
 		}
 	}
 }
 
-class AiScriptError extends Error {
+class AoiScriptError extends Error {
 	public info?: any;
 
 	constructor(message: string, info?: any) {
@@ -223,7 +388,7 @@ class AiScriptError extends Error {
 
 		// Maintains proper stack trace for where our error was thrown (only available on V8)
 		if (Error.captureStackTrace) {
-			Error.captureStackTrace(this, AiScriptError);
+			Error.captureStackTrace(this, AoiScriptError);
 		}
 	}
 }
@@ -256,7 +421,7 @@ class Scope {
 			}
 		}
 
-		throw new AiScriptError(
+		throw new AoiScriptError(
 			`No such variable '${name}' in scope '${this.name}'`, {
 				scope: this.layerdStates
 			});

src/client/scripts/aoiscript/index.ts

@@ -1,5 +1,5 @@
 /**
- * AiScript
+ * AoiScript
  */
 
 import {
@@ -95,6 +95,7 @@ export const literalDefs: Record<string, { out: any; category: string; icon: any
 	textList:      { out: 'stringArray', category: 'value', icon: faList, },
 	number:        { out: 'number',      category: 'value', icon: faSortNumericUp, },
 	ref:           { out: null,          category: 'value', icon: faMagic, },
+	aiScriptVar:   { out: null,          category: 'value', icon: faMagic, },
 	fn:            { out: 'function',    category: 'value', icon: faSquareRootAlt, },
 };
 
@@ -127,6 +128,7 @@ export const envVarsDef: Record<string, Type> = {
 	IS_CAT: 'boolean',
 	SEED: null,
 	YMD: 'string',
+	AISCRIPT_DISABLED: 'boolean',
 	NULL: null,
 };
 

src/client/scripts/aoiscript/type-checker.ts

@@ -8,7 +8,7 @@ type TypeError = {
 };
 
 /**
- * AiScript type checker
+ * AoiScript type checker
  */
 export class ASTypeChecker {
 	public variables: Variable[];
@@ -110,6 +110,7 @@ export class ASTypeChecker {
 
 			return null;
 		}
+		if (v.type === 'aiScriptVar') return null;
 		if (v.type === 'fn') return null; // todo
 		if (v.type.startsWith('fn:')) return null; // todo
 

src/client/scripts/create-aiscript-env.ts

@@ -0,0 +1,41 @@
+import { utils, values } from '@syuilo/aiscript';
+
+export function createAiScriptEnv(vm, opts) {
+	let apiRequests = 0;
+	return {
+		USER_ID: vm.$store.getters.isSignedIn ? values.STR(vm.$store.state.i.id) : values.NULL,
+		USER_NAME: vm.$store.getters.isSignedIn ? values.STR(vm.$store.state.i.name) : values.NULL,
+		USER_USERNAME: vm.$store.getters.isSignedIn ? values.STR(vm.$store.state.i.username) : values.NULL,
+		'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => {
+			await vm.$root.dialog({
+				type: type ? type.value : 'info',
+				title: title.value,
+				text: text.value,
+			});
+		}),
+		'Mk:confirm': values.FN_NATIVE(async ([title, text]) => {
+			const confirm = await vm.$root.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				title: title.value,
+				text: text.value,
+			});
+			return confirm.canceled ? values.FALSE : values.TRUE
+		}),
+		'Mk:api': values.FN_NATIVE(async ([ep, param, token]) => {
+			apiRequests++;
+			if (apiRequests > 16) return values.NULL;
+			const res = await vm.$root.api(ep.value, utils.valToJs(param), token || null);
+			return utils.jsToVal(res);
+		}),
+		'Mk:save': values.FN_NATIVE(([key, value]) => {
+			utils.assertString(key);
+			localStorage.setItem('aiscript:' + opts.storageKey + ':' + key.value, JSON.stringify(utils.valToJs(value)));
+			return values.NULL;
+		}),
+		'Mk:load': values.FN_NATIVE(([key]) => {
+			utils.assertString(key);
+			return utils.jsToVal(JSON.parse(localStorage.getItem('aiscript:' + opts.storageKey + ':' + key.value)));
+		}),
+	};
+}

src/client/scripts/is-device-touch.ts

@@ -0,0 +1,3 @@
+export function isDeviceTouch(): boolean {
+	return 'maxTouchPoints' in navigator && navigator.maxTouchPoints > 0;
+}

src/client/store.ts

@@ -42,6 +42,7 @@ const defaultDeviceSettings = {
 	animatedMfm: true,
 	imageNewTab: false,
 	showFixedPostForm: false,
+	disablePagesScript: true,
 	sfxVolume: 0.3,
 	sfxNote: 'syuilo/down',
 	sfxNoteMy: 'syuilo/up',
@@ -138,7 +139,7 @@ export default () => new Vuex.Store({
 			const promise = new Promise((resolve, reject) => {
 				// Append a credential
 				if (ctx.getters.isSignedIn) (data as any).i = ctx.state.i.token;
-				if (token) (data as any).i = token;
+				if (token !== undefined) (data as any).i = token;
 
 				// Send request
 				fetch(endpoint.indexOf('://') > -1 ? endpoint : `${apiUrl}/${endpoint}`, {

src/config/types.ts

@@ -35,6 +35,7 @@ export type Source = {
 
 	proxy?: string;
 	proxySmtp?: string;
+	proxyBypassHosts?: string[];
 
 	accesslog?: string;
 

src/docs/pages.ja-JP.md

@@ -7,4 +7,4 @@
 
 ユーザーからの入力を受け取るには、ページに「ユーザー入力」ブロックを設置し、「変数名」に入力を格納したい変数名を設定します(変数は自動で作成されます)。その変数を使ってユーザー入力に応じた動作を行えます。
 
-関数を使うと、値の算出処理を再利用可能な形にまとめることができます。関数を作るには、「関数」タイプの変数を作成します。関数にはスロット(引数)を設定することができ、スロットの値は関数内で変数として利用可能です。また、AiScript標準で関数を引数に取る関数(高階関数と呼ばれます)も存在します。関数は予め定義しておくほかに、このような高階関数のスロットに即席でセットすることもできます。
+関数を使うと、値の算出処理を再利用可能な形にまとめることができます。関数を作るには、「関数」タイプの変数を作成します。関数にはスロット(引数)を設定することができ、スロットの値は関数内で変数として利用可能です。また、関数を引数に取る関数(高階関数と呼ばれます)も存在します。関数は予め定義しておくほかに、このような高階関数のスロットに即席でセットすることもできます。

src/misc/download-url.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as stream from 'stream';
 import * as util from 'util';
 import fetch from 'node-fetch';
-import { httpAgent, httpsAgent } from './fetch';
+import { getAgentByUrl } from './fetch';
 import { AbortController } from 'abort-controller';
 import config from '../config';
 import * as chalk from 'chalk';
@@ -25,7 +25,7 @@ export async function downloadUrl(url: string, path: string) {
 		},
 		timeout: 10 * 1000,
 		signal: controller.signal,
-		agent: u => u.protocol == 'http:' ? httpAgent : httpsAgent,
+		agent: getAgentByUrl,
 	});
 
 	if (!response.ok) {

src/misc/fetch.ts

@@ -13,7 +13,7 @@ export async function getJson(url: string, accept = 'application/json, */*', tim
 			Accept: accept
 		}, headers || {}),
 		timeout,
-		agent: u => u.protocol == 'http:' ? httpAgent : httpsAgent,
+		agent: getAgentByUrl,
 	});
 
 	if (!res.ok) {
@@ -27,17 +27,46 @@ export async function getJson(url: string, accept = 'application/json, */*', tim
 	return await res.json();
 }
 
+/**
+ * Get http non-proxy agent
+ */
+const _http = new http.Agent({
+	keepAlive: true,
+	keepAliveMsecs: 30 * 1000,
+});
+
+/**
+ * Get https non-proxy agent
+ */
+const _https = new https.Agent({
+	keepAlive: true,
+	keepAliveMsecs: 30 * 1000,
+	lookup: cache.lookup,
+});
+
+/**
+ * Get http proxy or non-proxy agent
+ */
 export const httpAgent = config.proxy
 	? new HttpProxyAgent(config.proxy)
-	: new http.Agent({
-		keepAlive: true,
-		keepAliveMsecs: 30 * 1000,
-	});
+	: _http;
 
+/**
+ * Get https proxy or non-proxy agent
+ */
 export const httpsAgent = config.proxy
 	? new HttpsProxyAgent(config.proxy)
-	: new https.Agent({
-		keepAlive: true,
-		keepAliveMsecs: 30 * 1000,
-		lookup: cache.lookup,
-	});
+	: _https;
+
+/**
+ * Get agent by URL
+ * @param url URL
+ * @param bypassProxy Allways bypass proxy
+ */
+export function getAgentByUrl(url: URL, bypassProxy = false) {
+	if (bypassProxy || (config.proxyBypassHosts || []).includes(url.hostname)) {
+		return url.protocol == 'http:' ? _http : _https;
+	} else {
+		return url.protocol == 'http:' ? httpAgent : httpsAgent;
+	}
+}

src/misc/reaction-lib.ts

@@ -1,6 +1,7 @@
 import { emojiRegex } from './emoji-regex';
 import { fetchMeta } from './fetch-meta';
 import { Emojis } from '../models';
+import { toPunyNullable } from './convert-host';
 
 const legacies: Record<string, string> = {
 	'like':     '👍',
@@ -25,6 +26,8 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 	const _reactions = {} as Record<string, number>;
 
 	for (const reaction of Object.keys(reactions)) {
+		if (reactions[reaction] <= 0) continue;
+
 		if (Object.keys(legacies).includes(reaction)) {
 			if (_reactions[legacies[reaction]]) {
 				_reactions[legacies[reaction]] += reactions[reaction];
@@ -40,12 +43,20 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 		}
 	}
 
-	return _reactions;
+	const _reactions2 = {} as Record<string, number>;
+
+	for (const reaction of Object.keys(_reactions)) {
+		_reactions2[decodeReaction(reaction).reaction] = _reactions[reaction];
+	}
+
+	return _reactions2;
 }
 
-export async function toDbReaction(reaction?: string | null): Promise<string> {
+export async function toDbReaction(reaction?: string | null, reacterHost?: string | null): Promise<string> {
 	if (reaction == null) return await getFallbackReaction();
 
+	reacterHost = toPunyNullable(reacterHost);
+
 	// 文字列タイプのリアクションを絵文字に変換
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
 
@@ -59,20 +70,60 @@ export async function toDbReaction(reaction?: string | null): Promise<string> {
 		return unicode.match('\u200d') ? unicode : unicode.replace(/\ufe0f/g, '');
 	}
 
-	const custom = reaction.match(/^:([\w+-]+):$/);
+	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
 	if (custom) {
+		const name = custom[1];
 		const emoji = await Emojis.findOne({
-			host: null,
-			name: custom[1],
+			host: reacterHost || null,
+			name,
 		});
 
-		if (emoji) return reaction;
+		if (emoji) return reacterHost ? `:${name}@${reacterHost}:` : `:${name}:`
 	}
 
 	return await getFallbackReaction();
 }
 
+type DecodedReaction = {
+	/**
+	 * リアクション名 (Unicode Emoji or ':name@hostname' or ':name@.')
+	 */
+	reaction: string;
+
+	/**
+	 * name (カスタム絵文字の場合name, Emojiクエリに使う)
+	 */
+	name?: string;
+
+	/**
+	 * host (カスタム絵文字の場合host, Emojiクエリに使う)
+	 */
+	host?: string | null;
+};
+
+export function decodeReaction(str: string): DecodedReaction {
+	const custom = str.match(/^:([\w+-]+)(?:@([\w.-]+))?:$/);
+
+	if (custom) {
+		const name = custom[1];
+		const host = custom[2] || null;
+
+		return {
+			reaction: `:${name}@${host || '.'}:`,	// ローカル分は@以降を省略するのではなく.にする
+			name,
+			host
+		};
+	}
+
+	return {
+		reaction: str,
+		name: undefined,
+		host: undefined
+	};
+}
+
 export function convertLegacyReaction(reaction: string): string {
+	reaction = decodeReaction(reaction).reaction;
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
 	return reaction;
 }

src/models/entities/meta.ts

@@ -348,4 +348,9 @@ export class Meta {
 		default: true,
 	})
 	public objectStorageUseSSL: boolean;
+
+	@Column('boolean', {
+		default: true,
+	})
+	public objectStorageUseProxy: boolean;
 }

src/models/entities/note-reaction.ts

@@ -36,7 +36,7 @@ export class NoteReaction {
 	public note: Note | null;
 
 	@Column('varchar', {
-		length: 130
+		length: 260
 	})
 	public reaction: string;
 }

src/models/entities/page.ts

@@ -85,6 +85,12 @@ export class Page {
 	})
 	public variables: Record<string, any>[];
 
+	@Column('varchar', {
+		length: 16384,
+		default: ''
+	})
+	public script: string;
+
 	/**
 	 * public ... 公開
 	 * followers ... フォロワーのみ

src/models/repositories/note.ts

@@ -5,9 +5,11 @@ import { Emojis, Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls
 import { ensure } from '../../prelude/ensure';
 import { SchemaType } from '../../misc/schema';
 import { awaitAll } from '../../prelude/await-all';
-import { convertLegacyReaction, convertLegacyReactions } from '../../misc/reaction-lib';
+import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '../../misc/reaction-lib';
 import { toString } from '../../mfm/toString';
 import { parse } from '../../mfm/parse';
+import { Emoji } from '../entities/emoji';
+import { concat } from '../../prelude/array';
 
 export type PackedNote = SchemaType<typeof packedNoteSchema>;
 
@@ -129,31 +131,61 @@ export class NoteRepository extends Repository<Note> {
 			};
 		}
 
+		/**
+		 * 添付用emojisを解決する
+		 * @param emojiNames Note等に添付されたカスタム絵文字名 (:は含めない)
+		 * @param noteUserHost Noteのホスト
+		 * @param reactionNames Note等にリアクションされたカスタム絵文字名 (:は含めない)
+		 */
 		async function populateEmojis(emojiNames: string[], noteUserHost: string | null, reactionNames: string[]) {
-			const where = [] as {}[];
+			let all = [] as {
+				name: string,
+				url: string
+			}[];
 
+			// カスタム絵文字
 			if (emojiNames?.length > 0) {
-				where.push({
-					name: In(emojiNames),
-					host: noteUserHost
-				});
+				const tmp = await Emojis.find({
+					where: {
+						name: In(emojiNames),
+						host: noteUserHost
+					},
+					select: ['name', 'host', 'url']
+				}).then(emojis => emojis.map((emoji: Emoji) => {
+					return {
+						name: emoji.name,
+						url: emoji.url,
+					};
+				}));
+
+				all = concat([all, tmp]);
 			}
 
-			reactionNames = reactionNames?.filter(x => x.match(/^:[^:]+:$/)).map(x => x.replace(/:/g, ''));
+			const customReactions = reactionNames?.map(x => decodeReaction(x)).filter(x => x.name);
 
-			if (reactionNames?.length > 0) {
-				where.push({
-					name: In(reactionNames),
-					host: null
-				});
+			if (customReactions?.length > 0) {
+				const where = [] as {}[];
+
+				for (const customReaction of customReactions) {
+					where.push({
+						name: customReaction.name,
+						host: customReaction.host
+					});
+				}
+
+				const tmp = await Emojis.find({
+					where,
+					select: ['name', 'host', 'url']
+				}).then(emojis => emojis.map((emoji: Emoji) => {
+					return {
+						name: `${emoji.name}@${emoji.host || '.'}`,	// @host付きでローカルは.
+						url: emoji.url,
+					};
+				}));
+				all = concat([all, tmp]);
 			}
 
-			if (where.length === 0) return [];
-
-			return Emojis.find({
-				where,
-				select: ['name', 'host', 'url', 'aliases']
-			});
+			return all;
 		}
 
 		async function populateMyReaction() {

src/models/repositories/page.ts

@@ -74,6 +74,7 @@ export class PageRepository extends Repository<Page> {
 			hideTitleWhenPinned: page.hideTitleWhenPinned,
 			alignCenter: page.alignCenter,
 			font: page.font,
+			script: page.script,
 			eyeCatchingImageId: page.eyeCatchingImageId,
 			eyeCatchingImage: page.eyeCatchingImageId ? await DriveFiles.pack(page.eyeCatchingImageId) : null,
 			attachedFiles: DriveFiles.packMany(await Promise.all(attachedFiles)),

src/remote/activitypub/kernel/like.ts

@@ -1,7 +1,7 @@
 import { IRemoteUser } from '../../../models/entities/user';
 import { ILike, getApId } from '../type';
 import create from '../../../services/note/reaction/create';
-import { fetchNote } from '../models/note';
+import { fetchNote, extractEmojis } from '../models/note';
 
 export default async (actor: IRemoteUser, activity: ILike) => {
 	const targetUri = getApId(activity.object);
@@ -11,6 +11,8 @@ export default async (actor: IRemoteUser, activity: ILike) => {
 
 	if (actor.id === note.userId) return `skip: cannot react to my note`;
 
+	await extractEmojis(activity.tag || [], actor.host).catch(() => null);
+
 	await create(actor, note, activity._misskey_reaction || activity.content || activity.name);
 	return `ok`;
 };

src/remote/activitypub/renderer/like.ts

@@ -1,12 +1,30 @@
 import config from '../../../config';
 import { NoteReaction } from '../../../models/entities/note-reaction';
 import { Note } from '../../../models/entities/note';
+import { Emojis } from '../../../models';
+import renderEmoji from './emoji';
 
-export const renderLike = (noteReaction: NoteReaction, note: Note) => ({
-	type: 'Like',
-	id: `${config.url}/likes/${noteReaction.id}`,
-	actor: `${config.url}/users/${noteReaction.userId}`,
-	object: note.uri ? note.uri : `${config.url}/notes/${noteReaction.noteId}`,
-	content: noteReaction.reaction,
-	_misskey_reaction: noteReaction.reaction
-});
+export const renderLike = async (noteReaction: NoteReaction, note: Note) => {
+	const reaction = noteReaction.reaction;
+
+	const object =  {
+		type: 'Like',
+		id: `${config.url}/likes/${noteReaction.id}`,
+		actor: `${config.url}/users/${noteReaction.userId}`,
+		object: note.uri ? note.uri : `${config.url}/notes/${noteReaction.noteId}`,
+		content: reaction,
+		_misskey_reaction: reaction
+	} as any;
+
+	if (reaction.startsWith(':')) {
+		const name = reaction.replace(/:/g, '');
+		const emoji = await Emojis.findOne({
+			name,
+			host: null
+		});
+
+		if (emoji) object.tag = [ renderEmoji(emoji) ];
+	}
+
+	return object;
+};

src/remote/activitypub/request.ts

@@ -6,7 +6,7 @@ import config from '../../config';
 import { ILocalUser } from '../../models/entities/user';
 import { UserKeypairs } from '../../models';
 import { ensure } from '../../prelude/ensure';
-import { httpsAgent } from '../../misc/fetch';
+import { getAgentByUrl } from '../../misc/fetch';
 
 export default async (user: ILocalUser, url: string, object: any) => {
 	const timeout = 10 * 1000;
@@ -25,7 +25,7 @@ export default async (user: ILocalUser, url: string, object: any) => {
 
 	await new Promise((resolve, reject) => {
 		const req = https.request({
-			agent: httpsAgent,
+			agent: getAgentByUrl(new URL(`https://example.net`)),
 			protocol,
 			hostname,
 			port,

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

@@ -394,6 +394,10 @@ export const meta = {
 		objectStorageUseSSL: {
 			validator: $.optional.bool
 		},
+
+		objectStorageUseProxy: {
+			validator: $.optional.bool
+		}
 	}
 };
 
@@ -632,6 +636,10 @@ export default define(meta, async (ps, me) => {
 		set.objectStorageUseSSL = ps.objectStorageUseSSL;
 	}
 
+	if (ps.objectStorageUseProxy !== undefined) {
+		set.objectStorageUseProxy = ps.objectStorageUseProxy;
+	}
+
 	await getConnection().transaction(async transactionalEntityManager => {
 		const meta = await transactionalEntityManager.findOne(Meta, {
 			order: {

src/server/api/endpoints/meta.ts

@@ -190,6 +190,7 @@ export default define(meta, async (ps, me) => {
 		response.objectStorageAccessKey = instance.objectStorageAccessKey;
 		response.objectStorageSecretKey = instance.objectStorageSecretKey;
 		response.objectStorageUseSSL = instance.objectStorageUseSSL;
+		response.objectStorageUseProxy = instance.objectStorageUseProxy;
 	}
 
 	return response;

src/server/api/endpoints/notes/reactions.ts

@@ -79,7 +79,11 @@ export default define(meta, async (ps, user) => {
 	} as DeepPartial<NoteReaction>;
 
 	if (ps.type) {
-		query.reaction = ps.type;
+		// ローカルリアクションはホスト名が . とされているが
+		// DB 上ではそうではないので、必要に応じて変換
+		const suffix = '@.:';
+		const type = ps.type.endsWith(suffix) ? ps.type.slice(0, ps.type.length - suffix.length) + ':' : ps.type;
+		query.reaction = type;
 	}
 
 	const reactions = await NoteReactions.find({

src/server/api/endpoints/pages/create.ts

@@ -44,6 +44,10 @@ export const meta = {
 			validator: $.arr($.obj())
 		},
 
+		script: {
+			validator: $.str,
+		},
+
 		eyeCatchingImageId: {
 			validator: $.optional.nullable.type(ID),
 		},
@@ -115,6 +119,7 @@ export default define(meta, async (ps, user) => {
 		summary: ps.summary,
 		content: ps.content,
 		variables: ps.variables,
+		script: ps.script,
 		eyeCatchingImageId: eyeCatchingImage ? eyeCatchingImage.id : null,
 		userId: user.id,
 		visibility: 'public',

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

@@ -51,6 +51,10 @@ export const meta = {
 			validator: $.arr($.obj())
 		},
 
+		script: {
+			validator: $.str,
+		},
+
 		eyeCatchingImageId: {
 			validator: $.optional.nullable.type(ID),
 		},
@@ -132,6 +136,7 @@ export default define(meta, async (ps, user) => {
 		summary: ps.name === undefined ? page.summary : ps.summary,
 		content: ps.content,
 		variables: ps.variables,
+		script: ps.script,
 		alignCenter: ps.alignCenter === undefined ? page.alignCenter : ps.alignCenter,
 		hideTitleWhenPinned: ps.hideTitleWhenPinned === undefined ? page.hideTitleWhenPinned : ps.hideTitleWhenPinned,
 		font: ps.font === undefined ? page.font : ps.font,

src/services/drive/s3.ts

@@ -1,8 +1,12 @@
 import * as S3 from 'aws-sdk/clients/s3';
 import { Meta } from '../../models/entities/meta';
-import { httpsAgent, httpAgent } from '../../misc/fetch';
+import { getAgentByUrl } from '../../misc/fetch';
 
 export function getS3(meta: Meta) {
+	const u = meta.objectStorageEndpoint != null
+		? `${meta.objectStorageUseSSL ? 'https://' : 'http://'}${meta.objectStorageEndpoint}`
+		: `${meta.objectStorageUseSSL ? 'https://' : 'http://'}example.net`;
+
 	return new S3({
 		endpoint: meta.objectStorageEndpoint || undefined,
 		accessKeyId: meta.objectStorageAccessKey!,
@@ -11,7 +15,7 @@ export function getS3(meta: Meta) {
 		sslEnabled: meta.objectStorageUseSSL,
 		s3ForcePathStyle: !!meta.objectStorageEndpoint,
 		httpOptions: {
-			agent: meta.objectStorageUseSSL ? httpsAgent : httpAgent
+			agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy)
 		}
 	});
 }

src/services/note/reaction/create.ts

@@ -4,10 +4,10 @@ import { renderLike } from '../../../remote/activitypub/renderer/like';
 import DeliverManager from '../../../remote/activitypub/deliver-manager';
 import { renderActivity } from '../../../remote/activitypub/renderer';
 import { IdentifiableError } from '../../../misc/identifiable-error';
-import { toDbReaction } from '../../../misc/reaction-lib';
+import { toDbReaction, decodeReaction } from '../../../misc/reaction-lib';
 import { User, IRemoteUser } from '../../../models/entities/user';
 import { Note } from '../../../models/entities/note';
-import { NoteReactions, Users, NoteWatchings, Notes, UserProfiles } from '../../../models';
+import { NoteReactions, Users, NoteWatchings, Notes, UserProfiles, Emojis } from '../../../models';
 import { Not } from 'typeorm';
 import { perUserReactionsChart } from '../../chart';
 import { genId } from '../../../misc/gen-id';
@@ -20,7 +20,7 @@ export default async (user: User, note: Note, reaction?: string) => {
 		throw new IdentifiableError('2d8e7297-1873-4c00-8404-792c68d7bef0', 'cannot react to my note');
 	}
 
-	reaction = await toDbReaction(reaction);
+	reaction = await toDbReaction(reaction, user.host);
 
 	const exist = await NoteReactions.findOne({
 		noteId: note.id,
@@ -59,8 +59,27 @@ export default async (user: User, note: Note, reaction?: string) => {
 
 	perUserReactionsChart.update(user, note);
 
+	// カスタム絵文字リアクションだったら絵文字情報も送る
+	const decodedReaction = decodeReaction(reaction);
+
+	let emoji = await Emojis.findOne({
+		where: {
+			name: decodedReaction.name,
+			host: decodedReaction.host
+		},
+		select: ['name', 'host', 'url']
+	});
+
+	if (emoji) {
+		emoji = {
+			name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`,
+			url: emoji.url
+		} as any;
+	}
+
 	publishNoteStream(note.id, 'reacted', {
-		reaction: reaction,
+		reaction: decodedReaction.reaction,
+		emoji: emoji,
 		userId: user.id
 	});
 
@@ -96,7 +115,7 @@ export default async (user: User, note: Note, reaction?: string) => {
 
 	//#region 配信
 	if (Users.isLocalUser(user) && !note.localOnly) {
-		const content = renderActivity(renderLike(inserted, note));
+		const content = renderActivity(await renderLike(inserted, note));
 		const dm = new DeliverManager(user, content);
 		if (note.userHost !== null) {
 			const reactee = await Users.findOne(note.userId)

src/services/note/reaction/delete.ts

@@ -7,6 +7,7 @@ import { IdentifiableError } from '../../../misc/identifiable-error';
 import { User, IRemoteUser } from '../../../models/entities/user';
 import { Note } from '../../../models/entities/note';
 import { NoteReactions, Users, Notes } from '../../../models';
+import { decodeReaction } from '../../../misc/reaction-lib';
 
 export default async (user: User, note: Note) => {
 	// if already unreacted
@@ -20,7 +21,11 @@ export default async (user: User, note: Note) => {
 	}
 
 	// Delete reaction
-	await NoteReactions.delete(exist.id);
+	const result = await NoteReactions.delete(exist.id);
+
+	if (result.affected !== 1) {
+		throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
+	}
 
 	// Decrement reactions count
 	const sql = `jsonb_set("reactions", '{${exist.reaction}}', (COALESCE("reactions"->>'${exist.reaction}', '0')::int - 1)::text::jsonb)`;
@@ -34,13 +39,13 @@ export default async (user: User, note: Note) => {
 	Notes.decrement({ id: note.id }, 'score', 1);
 
 	publishNoteStream(note.id, 'unreacted', {
-		reaction: exist.reaction,
+		reaction: decodeReaction(exist.reaction).reaction,
 		userId: user.id
 	});
 
 	//#region 配信
 	if (Users.isLocalUser(user) && !note.localOnly) {
-		const content = renderActivity(renderUndo(renderLike(exist, note), user));
+		const content = renderActivity(renderUndo(await renderLike(exist, note), user));
 		const dm = new DeliverManager(user, content);
 		if (note.userHost !== null) {
 			const reactee = await Users.findOne(note.userId)

yarn.lock

@@ -144,13 +144,16 @@
   dependencies:
     type-detect "4.0.8"
 
-"@syuilo/aiscript@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.0.2.tgz#1aeb0999e817c525525b6425401cf499bdd7e0bc"
-  integrity sha512-0bIhG+PzJUB2ny8kOR9JypDfITgrBZhED5Kfj0KTtS3CKJAa3Klp8FWew5a6xL75fndduAf3caxHWf8X5QkWmg==
+"@syuilo/aiscript@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.4.1.tgz#13233c47a3e4a145ab8a0a5547be6c8b772d881c"
+  integrity sha512-iGtpAYIum607x5FeXRmljfw5RP1SqlGM9eanEnan5Sgm00hglPu9Wbd+6HpeK0sqJCpjJHrEbbqLl2XTKTAOaA==
   dependencies:
+    "@types/seedrandom" "2.4.28"
     autobind-decorator "2.4.0"
     chalk "4.0.0"
+    seedrandom "3.0.5"
+    uuid "7.0.3"
 
 "@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1":
   version "0.1.1"
@@ -199,10 +202,10 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bull@3.12.1":
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.12.1.tgz#dcf1ac40c4314a3dfa1a4a12662ce7201b2e4efa"
-  integrity sha512-mn1xmqKBNxllUGuOSBDOvsRpLHPDTSOsGQiHTv6t1gvGtIc/L1IFsN3YTmwf3AZenKzUcBQDGFLrCKt+abhrvQ==
+"@types/bull@3.12.2":
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.12.2.tgz#544a9c345531eabb8a961615297746cfea95b18b"
+  integrity sha512-OmAW/G0Fj+ySE/2xo1nJOzpR2XUKIym0Tzuh4rQGL/Jf6xiwafdkDe3lop6RmpKTZ+GrGi1Cz6zLtX2L8xmsOA==
   dependencies:
     "@types/ioredis" "*"
 
@@ -377,10 +380,10 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz#abf383c5b639d0aa8b8c4a420d6a85f703357d6c"
   integrity sha512-otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA==
 
-"@types/jsdom@16.2.0":
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.0.tgz#5a371a2efc1e0feec02c4bd2b3ce689e6ae691a2"
-  integrity sha512-I+qrFCzB97VlGJgvzGEwcUqmajpwqwTalmMvVfgJqFRVsY80lcCEQEGLJuVvge+whQyB1xcqTstAdxJshVVq0g==
+"@types/jsdom@16.2.1":
+  version "16.2.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.1.tgz#9e6eee6a578f74eed5997558ab430dbc11aac753"
+  integrity sha512-KCEq427OsWfpX7FRyEMb3i2XIuz8Pt3XPls4nmX0iMTDJWsHD4Kzoa3v4Uv9c9IDf11ALeHUtPcyAjTz/HV03Q==
   dependencies:
     "@types/node" "*"
     "@types/parse5" "*"
@@ -531,10 +534,10 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
   integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
 
-"@types/node-fetch@2.5.5":
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.5.tgz#cd264e20a81f4600a6c52864d38e7fef72485e92"
-  integrity sha512-IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA==
+"@types/node-fetch@2.5.6":
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.6.tgz#df8377a66e64ddf75b65b072e37b3c5c5425a96f"
+  integrity sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -544,10 +547,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7"
   integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==
 
-"@types/node@13.11.0":
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
-  integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
+"@types/node@13.13.0":
+  version "13.13.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.0.tgz#30d2d09f623fe32cde9cb582c7a6eda2788ce4a8"
+  integrity sha512-WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A==
 
 "@types/nodemailer@6.4.0":
   version "6.4.0"
@@ -622,13 +625,20 @@
   dependencies:
     "@types/redis" "*"
 
-"@types/redis@*", "@types/redis@2.8.17":
+"@types/redis@*":
   version "2.8.17"
   resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.17.tgz#c114039957bfcad3b2d487f1ea39aae58b550095"
   integrity sha512-7RVHFjClwG1x987MSIKusCMMicu7tsvpGgwPTJpYgf0j896G+LCeyGMewDBKVxc9Tlj5OjA9y7PtgvwGVQsACg==
   dependencies:
     "@types/node" "*"
 
+"@types/redis@2.8.18":
+  version "2.8.18"
+  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.18.tgz#6e95de50d848cd9c0aacb89aa8a6aef07a0a34b3"
+  integrity sha512-29ffRZITbLRs4zboL31EPJVDhSC/pHommWpf0rRcpwz45fvH6U2VxdRM6wWPSJu23l/kXQNKrMR8SAlLB7OqbQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/rename@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/rename/-/rename-1.0.1.tgz#89ef152d73f2400835c5d835c5e22d3eb6b21ba6"
@@ -799,37 +809,37 @@
   dependencies:
     "@types/node" "*"
 
-"@types/ws@7.2.3":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.3.tgz#a3add56077ac6cc9396b9502c7252a1635922032"
-  integrity sha512-VT/GK7nvDA7lfHy40G3LKM+ICqmdIsBLBHGXcWD97MtqQEjNMX+7Gudo8YGpaSlYdTX7IFThhCE8Jx09HegymQ==
+"@types/ws@7.2.4":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.4.tgz#b3859f7b9c243b220efac9716ec42c716a72969d"
+  integrity sha512-9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg==
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/experimental-utils@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d"
-  integrity sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==
+"@typescript-eslint/experimental-utils@2.28.0":
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz#1fd0961cd8ef6522687b4c562647da6e71f8833d"
+  integrity sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.26.0"
+    "@typescript-eslint/typescript-estree" "2.28.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.26.0.tgz#385463615818b33acb72a25b39c03579df93d76f"
-  integrity sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==
+"@typescript-eslint/parser@2.28.0":
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385"
+  integrity sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.26.0"
-    "@typescript-eslint/typescript-estree" "2.26.0"
+    "@typescript-eslint/experimental-utils" "2.28.0"
+    "@typescript-eslint/typescript-estree" "2.28.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/typescript-estree@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56"
-  integrity sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==
+"@typescript-eslint/typescript-estree@2.28.0":
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz#d34949099ff81092c36dc275b6a1ea580729ba00"
+  integrity sha512-HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -1141,11 +1151,6 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-animejs@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/animejs/-/animejs-3.1.0.tgz#748a90fc1d4bef3efed64508af9a6a82babf5c47"
-  integrity sha512-BjnCroPPQPEAngT0M89pz9TBcOGgOFLnVoq3+jV2upl4rn60k57/AXvESTnuILsNgOEjGuhMEOMp7IlQzk40kA==
-
 ansi-colors@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
@@ -1243,10 +1248,10 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.17.1.tgz#e7404e0838d2ad40e6469b1f3a9ef39bcae4bc3d"
-  integrity sha512-zfeyHGSkz8iyCk461mbq5cpjhkGiTXz+NaVivCAbeqqRARg7oDDrwLD6MK+mA5Zl5MBqS2lXlcJP56C4rxq3BA==
+apexcharts@3.18.1:
+  version "3.18.1"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.18.1.tgz#ede3fe30411b5bf05d2840c8ab0c9bbdc519e4f7"
+  integrity sha512-xBhuEegV8RK1q3UVC/jezdN/bwTvCAcmjuOu+UutO+pFdM9qy6RifB4jKU/8Ek7ZPucmnDRDI2YJ0iXTKbzzYg==
   dependencies:
     svg.draggable.js "^2.2.2"
     svg.easing.js "^2.0.0"
@@ -1497,10 +1502,10 @@ autwh@0.1.0:
   dependencies:
     oauth "0.9.15"
 
-aws-sdk@2.653.0:
-  version "2.653.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.653.0.tgz#53fa0b8cd5c05fb2244df262f2a01de526376543"
-  integrity sha512-vtpHfoAKoudNa5kknUgQeXzdnmkI63hqKYHuk5u7mx0HelP8iybTxmKfKENlOvkfKtBdCEbcmJRa3DxZUbQPHQ==
+aws-sdk@2.658.0:
+  version "2.658.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.658.0.tgz#dd0b1225d2b42eebdf9c4347a9568f317c0b90b1"
+  integrity sha512-vb+CorOG2lod4ZztrVaE3hcSjTwnB9HhTOnD/2R9YJtIUGTJqL0CIDTwo0Q384GFROtDhp7j6SX7oKFwdzDEuA==
   dependencies:
     buffer "4.9.1"
     events "1.1.1"
@@ -2019,10 +2024,10 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-cbor@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.0.1.tgz#243eea46b19c6e54ffb18fb07fa52c1c627a6f05"
-  integrity sha512-l4ghwqioCyuAaD3LvY4ONwv8NMuERz62xjbMHGdWBqERJPygVmoFER1b4+VS6iW0rXwoVGuKZPPPTofwWOg3YQ==
+cbor@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.0.2.tgz#aa8c3820280ebb9f3a45b2a4c66ac344294443de"
+  integrity sha512-6JiKVURxxO92FntzTJq54QdN/8fBaBwD7+nNyGIAi1HL9mBgU3YK6ULV8k7WTuT/EwfRsjy3MuqDKlkQMCmfXg==
   dependencies:
     bignumber.js "^9.0.0"
     nofilter "^1.0.3"
@@ -2785,23 +2790,24 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202"
-  integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==
+css-loader@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.2.tgz#6483ae56f48a7f901fbe07dde2fc96b01eafab3c"
+  integrity sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
     loader-utils "^1.2.3"
     normalize-path "^3.0.0"
-    postcss "^7.0.23"
+    postcss "^7.0.27"
     postcss-modules-extract-imports "^2.0.0"
     postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.1.1"
+    postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.2"
-    schema-utils "^2.6.0"
+    postcss-value-parser "^4.0.3"
+    schema-utils "^2.6.5"
+    semver "^6.3.0"
 
 css-select-base-adapter@^0.1.1:
   version "0.1.1"
@@ -3028,7 +3034,7 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@3.X, debug@^3.1.0, debug@^3.2.6:
+debug@3.2.6, debug@3.X, debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3190,7 +3196,7 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
-detect-libc@^1.0.2, detect-libc@^1.0.3:
+detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -4154,13 +4160,6 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4454,10 +4453,10 @@ gulp-cli@^2.2.0:
     v8flags "^3.0.1"
     yargs "^7.1.0"
 
-gulp-dart-sass@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-dart-sass/-/gulp-dart-sass-1.0.0.tgz#8408e6cf2863ba3dbbdcda19b4554c8904c9f9ad"
-  integrity sha512-wNufwTCnP26VYQxGRli5p16YSlNtr93kVh0Rwz2xHbsL5MH1T1WhRjne4hh58nJwN+fNAdaKz4vXEM8yU2Suzw==
+gulp-dart-sass@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gulp-dart-sass/-/gulp-dart-sass-1.0.1.tgz#fef34b2373d13609b61a6d52013d2abffde57f8a"
+  integrity sha512-Hsa6cy4N9L3QZGfSabtRl60czLOqm7VngAjS+BNdWpRwCRbc+x8kWT+xEKLq5M2Pq+Or1d4Onr8qGrWJR0CQMA==
   dependencies:
     chalk "^2.3.0"
     lodash.clonedeep "^4.3.2"
@@ -4869,7 +4868,7 @@ humanize-number@0.0.2:
   resolved "https://registry.yarnpkg.com/humanize-number/-/humanize-number-0.0.2.tgz#11c0af6a471643633588588048f1799541489c18"
   integrity sha1-EcCvakcWQ2M1iFiASPF5lUFInBg=
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4893,13 +4892,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5573,10 +5565,10 @@ json5-loader@3.0.0:
     loader-utils "^1.2.3"
     schema-utils "^1.0.0"
 
-json5@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
+json5@2.1.3, json5@^2.1.0, json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
     minimist "^1.2.5"
 
@@ -5587,13 +5579,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5604,10 +5589,10 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsrsasign@8.0.13:
-  version "8.0.13"
-  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-8.0.13.tgz#e9ac95965c61f9e17d0bf5f9b5af2dd9f9c5e22b"
-  integrity sha512-sy8rk/6IQf9pDb8A0ZTbLmEdxUVkhhXfhmfVawS9cBOZqZJeYuSQ1zG9yO+cB8LORfj/iBM2r856Lxu+uLJYnA==
+jsrsasign@8.0.15:
+  version "8.0.15"
+  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-8.0.15.tgz#0d56856efa75fad84b578655249700f500388112"
+  integrity sha512-6UKHqnNs5lYROn03wf1BTw7DQx5tW616DTigjbo0JHV97D3HzIqYmPVCBSNsfEfQOrfpFqmPZJvaC3cMNOT0Yw==
 
 jstransformer@1.0.0:
   version "1.0.0"
@@ -5702,10 +5687,10 @@ koa-compose@^4.1.0:
   resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
   integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
 
-koa-compress@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-3.0.0.tgz#3194059c215cbc24e59bbc84c2c7453a4c88564f"
-  integrity sha512-xol+LkNB1mozKJkB5Kj6nYXbJXhkLkZlXl9BsGBPjujVfZ8MsIXwU4GHRTT7TlSfUcl2DU3JtC+j6wOWcovfuQ==
+koa-compress@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-3.1.0.tgz#00fb0af695dc4661c6de261a18da669626ea3ca1"
+  integrity sha512-0m24/yS/GbhWI+g9FqtvStY+yJwTObwoxOvPok6itVjRen7PBWkjsJ8pre76m+99YybXLKhOJ62mJ268qyBFMQ==
   dependencies:
     bytes "^3.0.0"
     compressible "^2.0.0"
@@ -5956,6 +5941,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6420,14 +6414,6 @@ minipass-pipeline@^1.2.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
@@ -6435,13 +6421,6 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 minizlib@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
@@ -6493,7 +6472,7 @@ mkdirp@0.5.4:
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -6675,15 +6654,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6793,22 +6763,6 @@ node-object-hash@^1.2.0:
   resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94"
   integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ==
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.53:
   version "1.1.53"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
@@ -6829,7 +6783,7 @@ noop-logger@^0.1.1:
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
   integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
 
-nopt@^4.0.1, nopt@^4.0.3:
+nopt@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
@@ -6871,27 +6825,6 @@ now-and-later@^2.0.0:
   dependencies:
     once "^1.3.2"
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6906,7 +6839,7 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.0.1, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -7455,16 +7388,16 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-packet-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914"
-  integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==
-
-pg-pool@^3.0.0:
+pg-pool@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.1.0.tgz#65f24bbda56cf7368f03ecdfd65e1da571041901"
   integrity sha512-CvxGctDwjZZad6Q7vvhFA4BsYdk26UFIZaFH0XXqHId5uBOc26vco/GFh/laUVIQUpD9IKe/f9/mr/OQHyQ2ZA==
 
+pg-protocol@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.1.tgz#60adffeef131418c58f0b20df01ae8f507a95370"
+  integrity sha512-IqZ+VUOqg3yydxSt5NgNKLVK9JgPBuzq4ZbA9GmrmIkQjQAszPT9DLqTtID0mKsLEZB68PU0gjLla561WZ2QkQ==
+
 pg-types@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
@@ -7476,16 +7409,16 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.0.tgz#6559c6f895b9e735b3079995acb5de3f39ade59f"
-  integrity sha512-jinx9Xcmkeh7Y7gatu2EJiXr37mcDeF0G5X14MjqPMwYjoZMk7PMMSTTXQQl03GRp2IICxo/zyybqfv2RNgXsg==
+pg@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.2.tgz#883f869f61ab074ded386d305ad3f99056d0073e"
+  integrity sha512-ngOUEDk69kLdH/k/YLT2NRIBcUiPFRcY4l51dviqn79P5qIa5jBIGIFTIGXh4OlT/6gpiCAza5a9uy08izpFQQ==
   dependencies:
     buffer-writer "2.0.0"
     packet-reader "1.0.0"
     pg-connection-string "0.1.3"
-    pg-packet-stream "^1.1.0"
-    pg-pool "^3.0.0"
+    pg-pool "^3.1.0"
+    pg-protocol "^1.2.1"
     pg-types "^2.1.0"
     pgpass "1.x"
     semver "4.3.2"
@@ -7736,7 +7669,7 @@ postcss-modules-local-by-default@^3.0.2:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.0.0"
 
-postcss-modules-scope@^2.1.1:
+postcss-modules-scope@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
   integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
@@ -7904,12 +7837,12 @@ postcss-value-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
   integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.27"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
   integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
@@ -7998,10 +7931,10 @@ printj@~1.1.0:
   resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
   integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
 
-prismjs@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc"
-  integrity sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw==
+prismjs@1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03"
+  integrity sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==
   optionalDependencies:
     clipboard "^2.0.0"
 
@@ -8793,7 +8726,7 @@ rimraf@3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -8918,7 +8851,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4:
+schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.4:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
   integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
@@ -8926,6 +8859,14 @@ schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
+schema-utils@^2.6.5:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
+  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+  dependencies:
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
+
 scrollmonitor@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/scrollmonitor/-/scrollmonitor-1.2.4.tgz#823d04cc1574aa3b71de7cc70ef91ebe633344a0"
@@ -9551,13 +9492,13 @@ strtok3@^6.0.0:
     debug "^4.1.1"
     peek-readable "^3.1.0"
 
-style-loader@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200"
-  integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==
+style-loader@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.4.tgz#1ad81283cefe51096756fd62697258edad933230"
+  integrity sha512-SbBHRD8fwK3pX+4UDF4ETxUF0+rCvk29LWTTI7Rt0cgsDjAj3SWM76ByTe6u2+4IlJ/WwluB7wuslWETCoPQdg==
   dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.6.4"
+    loader-utils "^2.0.0"
+    schema-utils "^2.6.5"
 
 stylehacks@^4.0.0:
   version "4.0.3"
@@ -9710,16 +9651,11 @@ syslog-pro@1.0.0:
   dependencies:
     moment "^2.22.2"
 
-systeminformation@*:
+systeminformation@*, systeminformation@4.23.3:
   version "4.23.3"
   resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.23.3.tgz#abb618a66365181f2ef9de58ba2101fb36a1f005"
   integrity sha512-TIGmv7O1vVw00ldkj8ckHJr667l/lbLxvYB5IrJZ7pxzKXt7RmCduvzHbFM6k2Owif/dGd7oEmRkaQJEH9ewng==
 
-systeminformation@4.23.1:
-  version "4.23.1"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.23.1.tgz#03dcc16570adfa1e0b6ceb871aad8f34c9ae8014"
-  integrity sha512-gtqfvz5jUIMqWn0kkdkV4G8uiLmJckQ+z6aKy1uyE0OPU/6tStubahtZDiF0ajSRVJht+Vd4pX5DDwQLhAapww==
-
 syuilo-password-strength@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/syuilo-password-strength/-/syuilo-password-strength-0.0.1.tgz#08f71a8f0ecb77db649f3d9a6424510d9d945f52"
@@ -9761,19 +9697,6 @@ tar-stream@^2.0.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 tar@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz#7b3bd6c313cb6e0153770108f8d70ac298607efa"
@@ -10059,10 +9982,10 @@ ts-loader@6.2.2:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-ts-node@8.8.1:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.8.1.tgz#7c4d3e9ed33aa703b64b28d7f9d194768be5064d"
-  integrity sha512-10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg==
+ts-node@8.8.2:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.8.2.tgz#0b39e690bee39ea5111513a9d2bcdc0bc121755f"
+  integrity sha512-duVj6BpSpUpD/oM4MfhO98ozgkp3Gt9qIp3jGxwU2DFvl/3IRaEAvbLa8G60uS7C77457e/m5TMowjedeRxI1Q==
   dependencies:
     arg "^4.1.0"
     diff "^4.0.1"
@@ -10599,10 +10522,10 @@ vue-content-loading@1.6.0:
   dependencies:
     vue "^2.5.13"
 
-vue-cropperjs@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/vue-cropperjs/-/vue-cropperjs-4.0.1.tgz#1d4cd2f7b5292ffe83de780c76e4a2dec2b66118"
-  integrity sha512-THkBBhiRHUX188QdVnyQzFWOW2g0oBMbEQ2t7sWenPxpaGZ1tFMePG2878Iw+6z6PRzq+dT0FubTtfZZzdSyxw==
+vue-cropperjs@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/vue-cropperjs/-/vue-cropperjs-4.1.0.tgz#f52b944611e689fd5f0c59bab0b30fe64de1b58e"
+  integrity sha512-ORQTaxsygsFvz21Hyf5yNUwQXGRdLXYF4964ueLjR+VpKjHkoqV67oDT3gLCHyrq5HRKmwJPShUiHzdhIo3JTQ==
   dependencies:
     cropperjs "^1.5.6"
 
@@ -10623,10 +10546,10 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-i18n@8.16.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.16.0.tgz#f84188a36a4cc3c876427b869c7c5a82d6696080"
-  integrity sha512-cp9JOsx4ETzlCsnD22FE8ZhAmD8kcyNLRKV0DPsS7bBNTCdIlOKuyTGonWKYcGCUtNMtwemDWRBevRm8eevBVg==
+vue-i18n@8.17.2:
+  version "8.17.2"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.17.2.tgz#9ad15f5506ff012f6f770ec0474dcb714d96cd2d"
+  integrity sha512-YIW0aXW/dzxI0rk9qYttvISv+Tt+w5WVjengswTLK0mKhwIfrAyMssbawohIn9tsmoxcHcA0G20bU7e/t2JATA==
 
 vue-json-pretty@1.6.3:
   version "1.6.3"
@@ -10658,10 +10581,10 @@ vue-meta@2.3.3:
   dependencies:
     deepmerge "^4.2.2"
 
-vue-prism-component@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.1.1.tgz#df0e375f7f9b367b069b2d54e6ed86facde96030"
-  integrity sha512-M4wM7gMIagWgf3YNS5Hrq7YDYu0pYbqMaJOhkVDfCfJ1col4ZCv+uyWpW/gkYZCuG3ic8UF3EAV22asm4pWjMA==
+vue-prism-component@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.2.0.tgz#406252e16979def13b5d28827d95b2b6dc647825"
+  integrity sha512-0N9CNuQu+36CJpdsZHrhdq7d18oBvjVMjawyKdIr8xuzFWLfdxECZQYbFaYoopPBg3SvkEEMtkhYqdgTQl5Y+A==
 
 vue-prism-editor@0.5.1:
   version "0.5.1"
@@ -11068,7 +10991,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==