12.8.0

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

CHANGELOG.md

@@ -1,6 +1,56 @@
 ChangeLog
 =========
 
+12.8.0 (2020/02/13)
+--------------------
+### ✨Improvements
+* タイムラインなどを遡っているときは新しいアイテムが来てもスクロールしないように
+* 表示言語を切り替えられるように
+* グループに招待されたときの通知を追加
+* フランス語と関西弁を有効に
+* OSネイティブの絵文字を使用オプションを追加
+
+### 🐛Fixes
+* リストを追加するとエラーが出る問題を修正
+* タイムラインを放置すると先頭の投稿が見えなくなるのを修正
+
+12.7.1 (2020/02/11)
+--------------------
+### 🐛Fixes
+* 非ログイン時にページが表示されない問題を修正
+
+12.7.0 (2020/02/10)
+--------------------
+### ✨Improvements
+* ノートの文字数制限の設定を復活
+* デザインの調整
+
+### 🐛Fixes
+* 中国語で表示できない問題を修正
+
+12.6.0 (2020/02/10)
+--------------------
+### ✨Improvements
+* リンクにホバーするとURLプレビューを表示するように
+* ユーザーページからグループに招待できるように
+* ウィジェットはブラウザごとに記憶するように
+
+### 🐛Fixes
+* 要素の幅を判定する処理が上手くいかないことがある問題を修正
+
+12.5.0 (2020/02/09)
+--------------------
+### ✨Improvements
+* チュートリアルを実装
+* 検索のキーボードショートカットを追加
+* タイムラインを遡っている状況でないときに、誰かをフォローまたはフォロー解除したときにタイムラインをリロードするように
+
+### 🐛Fixes
+* グループチャットが開始できない問題を修正
+* Renoteメニューが開けない問題を修正
+* 誕生日設定が崩れていたのを修正
+* キャッシュが削除できない問題を修正
+
 12.4.1 (2020/02/09)
 --------------------
 ### 🐛Fixes

locales/cs-CZ.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Čeština"

locales/da-DK.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Dansk"

locales/de-DE.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Deutsch"

locales/en-US.yml

@@ -1,20 +1,5 @@
 ---
-_ago:
-  unknown: "Unknown"
-  future: "Future"
-  justNow: "Just now"
-  secondsAgo: "{n}s ago"
-  minutesAgo: "{n}m ago"
-  hoursAgo: "{n}h ago"
-  daysAgo: "{n}d ago"
-  weeksAgo: "{n}week(s) ago"
-  monthsAgo: "{n}month(s) ago"
-  yearsAgo: "{n}year(s) ago"
-_time:
-  second: "s"
-  minute: "m"
-  hour: "h"
-  day: "d"
+_lang_: "English"
 introMisskey: "Welcome! Misskey is an open source distributed microblogging service.\nCreate \"notes\" to share what's happening or to tell everyone about you📡\nThen send \"reactions\" to respond quickly to everyone's notes👍\nLet's explore a new world🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
@@ -84,7 +69,7 @@ enterListName: "List name"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
 defaultNoteVisibility: "Default visibility"
-follow: "Following"
+follow: "Follow"
 followRequest: "Request follow"
 followRequests: "Follow requests"
 unfollow: "Unfollow"
@@ -127,7 +112,7 @@ flagAsBot: "This account is a bot"
 flagAsCat: "This account is a cat"
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
 addAcount: "Add Account"
-loginFailed: "Sign in failure"
+loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
 general: "General"
 wallpaper: "Wallpaper"
@@ -214,12 +199,10 @@ remove: "Delete"
 removed: "Successfully deleted"
 removeAreYouSure: "Are you sure that you want to delete \"{x}\"?"
 saved: "Saved"
-messaging: "Talk"
+messaging: "Messaging"
 upload: "Upload"
 fromDrive: "From Drive"
 fromUrl: "From URL"
-editWidgets: "Edit widgets"
-exitEdit: "Finish editing"
 explore: "Explore"
 games: "Misskey Games"
 messageRead: "Read"
@@ -266,8 +249,8 @@ instanceDescription: "Instance description"
 maintainerName: "Maintainer"
 maintainerEmail: "Maintainer email"
 tosUrl: "Terms of Service URL"
-thisYear: "This year"
-thisMonth: "This month"
+thisYear: "Year"
+thisMonth: "Month"
 today: "Today"
 dayX: "{day} days"
 monthX: "{month} months"
@@ -342,12 +325,13 @@ registerSecurityKey: "Register a security key"
 lastUsed: "Last used"
 unregister: "Unregister"
 passwordLessLogin: "Set up password-less login"
-resetPassword: "Reste password"
+resetPassword: "Reset password"
 newPasswordIs: "The new password is \"{password}\""
 post: "Notes"
 posted: "Posted!"
 autoReloadWhenDisconnected: "Auto reload when disconnected with server"
 autoNoteWatch: "Watch note automatically"
+autoNoteWatchDescription: "Get notified about the notes which you reactioned or replied."
 reduceUiAnimation: "Reduce animations of User Interface"
 share: "Share"
 notFound: "Not found"
@@ -356,7 +340,7 @@ uploadFolder: "Default Upload location"
 cacheClear: "Clear cache"
 markAsReadAllNotifications: "Mark all notifications as read"
 markAsReadAllUnreadNotes: "Mark all notes as read"
-markAsReadAllTalkMessages: "Mark all conversations as read"
+markAsReadAllTalkMessages: "Mark all messages as read"
 help: "Help"
 inputMessageHere: "Enter message here"
 close: "Close"
@@ -369,6 +353,77 @@ invites: "Invite"
 groupName: "Group name"
 members: "Members"
 transfer: "Transfer"
+messagingWithUser: "Messaging with other user"
+messagingWithGroup: "Messaging within group"
+title: "Title"
+text: "Text"
+enable: "Enable"
+next: "Next"
+retype: "Enter again"
+noteOf: "{user}'s notes"
+inviteToGroup: "Invite to group"
+maxNoteTextLength: "Character limit of the note"
+quoteAttached: "Quoted"
+quoteQuestion: "Do you want to append a quote?"
+noMessagesYet: "No messages yet"
+newMessageExists: "You've got a new message"
+onlyOneFileCanBeAttached: "You can only attach one file to a message"
+signinRequired: "Please sign in"
+invitationCode: "Invitation code"
+checking: "Checking"
+available: "Available"
+unavailable: "Not available"
+usernameInvalidFormat: "letters, numbers and _ are acceptable."
+tooShort: "Too short"
+tooLong: "Too long"
+weakPassword: "Weak password"
+normalPassword: "Good password"
+strongPassword: "Strong password"
+passwordMatched: "Matched"
+passwordNotMatched: "Doesn't match"
+signinWith: "Sign in with {x}"
+tapSecurityKey: "Tap your security key"
+or: "Or"
+uiLanguage: "UI display language"
+_ago:
+  unknown: "Unknown"
+  future: "Future"
+  justNow: "Just now"
+  secondsAgo: "{n}s ago"
+  minutesAgo: "{n}m ago"
+  hoursAgo: "{n}h ago"
+  daysAgo: "{n}d ago"
+  weeksAgo: "{n}week(s) ago"
+  monthsAgo: "{n}month(s) ago"
+  yearsAgo: "{n}year(s) ago"
+_time:
+  second: "s"
+  minute: "m"
+  hour: "h"
+  day: "d"
+_tutorial:
+  title: "How to use Misskey"
+  step1_1: "Welcome!"
+  step1_2: "This page is called \"timeline\". It shows chronologically ordered \"notes\" of people who you \"follow\"."
+  step1_3: "Your timeline is currently empty, since you have not posed any notes or followed anyone yet."
+  step2_1: "Let's finish setting up your profile before writing a note or following anyone."
+  step2_2: "Providing some information about who you are will make it easier for others to follow you back."
+  step3_1: "Finished setting up your profile?"
+  step3_2: "The next step is to post a note. You can do this by pressing a pencil icon on the screen."
+  step3_3: "Fill in the modal and press the button on the right top to post."
+  step3_4: "Have nothing to say? Try \"I just started Misskey!\""
+  step4_1: "Finished posting your first note?"
+  step4_2: "Hurray! Now your first note is displayed on your timeline."
+  step5_1: "Now, let's try making your timeline more lively by following other people."
+  step5_2: "{featured} will show you trending notes in this instance. {explore} will let you find trending users. Try following people you like!"
+  step5_3: "To follow other users, click on their icon and press \"follow\" button on their profile."
+  step5_4: "If the other user has a lock icon next to their name, that user will have to manually approve your follow request."
+  step6_1: "Now you will be able to see other users' notes on your timeline."
+  step6_2: "You can also put \"reactions\" on other people's notes to quickly respond."
+  step6_3: "To attach a \"reaction\", press \"+\" mark on other user's note and choose an emoji you'd like to react with."
+  step7_1: "Congratulations! You have now finished Misskey's basic tutorial."
+  step7_2: "If you would like to learn more about Misskey, try the {help} section."
+  step7_3: "Good luck and have fun! 🚀"
 _2fa:
   alreadyRegistered: "You have already registered 2-factor authentication device."
   registerDevice: "Register a new device"
@@ -389,11 +444,11 @@ _permissions:
   "write:favorites": "Edit your favorites list"
   "read:following": "View your following information"
   "write:following": "Follow or unfollow other accounts"
-  "read:messaging": "View your talks"
-  "write:messaging": "Start or delete your talks"
+  "read:messaging": "View your messages"
+  "write:messaging": "Compose or Delete messages"
   "read:mutes": "View the list of people you muted"
   "write:mutes": "Edit the list of people you muted"
-  "write:notes": "Compose and delete notes"
+  "write:notes": "Compose or Delete notes"
   "read:notifications": "View notifications"
   "write:notifications": "Work with notifications"
   "read:reactions": "View reactions"
@@ -466,6 +521,7 @@ _visibility:
   followersDescription: "Post to followers only"
   specified: "Direct"
   specifiedDescription: "Post to specified users only"
+  localOnly: "Local only"
 _postForm:
   replyPlaceholder: "Reply to this note..."
   quotePlaceholder: "Quote this note..."

locales/es-ES.yml

@@ -1,20 +1,5 @@
 ---
-_ago:
-  unknown: "Desconocido"
-  future: "Futuro"
-  justNow: "Recién ahora"
-  secondsAgo: "Hace {n} segundos"
-  minutesAgo: "Hace {n} minutos"
-  hoursAgo: "Hace {n} horas"
-  daysAgo: "Hace {n} días"
-  weeksAgo: "Hace {n} semanas"
-  monthsAgo: "Hace {n} meses"
-  yearsAgo: "Hace {n} años"
-_time:
-  second: "Segundos"
-  minute: "Minutos"
-  hour: "Horas"
-  day: "Días"
+_lang_: "Español"
 introMisskey: "¡Bienvenido/a! Misskey es un servicio de microblogging descentralizado de código abierto. Escribe \"notas\" para compartir lo que te ocurre ahora o para contar sobre ti a todos. 📡\nCon la función de \"reacciones\", puedes también añadir una reacción rápida a las notas de todos.👍\nExplora un nuevo mundo.🚀"
 monthAndDay: "{day}/{month}"
 search: "Buscar"
@@ -214,18 +199,16 @@ remove: "Borrar"
 removed: "Borrado"
 removeAreYouSure: "¿Desea borrar \"{x}\"?"
 saved: "Guardado"
-messaging: "Conversación"
+messaging: "Chat"
 upload: "Subir"
 fromDrive: "Desde el drive"
 fromUrl: "Desde la URL"
-editWidgets: "Editar widgets"
-exitEdit: "Terminar edición"
 explore: "Explorar"
 games: "Misskey Games"
 messageRead: "Ya leído"
 recentUsedEmojis: "Emojis usados recientemente"
 noMoreHistory: "El historial se ha acabado"
-startMessaging: "Iniciar conversación"
+startMessaging: "Iniciar chat"
 nUsersRead: "Leído por {n} personas"
 agreeTo: "De acuerdo con {0}"
 tos: "Términos de uso"
@@ -348,18 +331,108 @@ 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"
 reduceUiAnimation: "Reducir la animación de la UI"
 share: "Compartir"
 notFound: "No se encuentra"
 notFoundDescription: "No se encontró la página correspondiente a la URL elegida"
+uploadFolder: "Carpeta de subidas por defecto"
+cacheClear: "Borrar caché"
+markAsReadAllNotifications: "Marcar todas las notificaciones como leídas"
+markAsReadAllUnreadNotes: "Marcar todas las notas como leídas"
+markAsReadAllTalkMessages: "Marcar todos los chats como leídos"
 help: "Ayuda"
+inputMessageHere: "Escribe el mensaje aquí"
+close: "Cerrar"
+group: "Grupo"
+groups: "Grupos"
+createGroup: "Crear grupo"
+ownedGroups: "Tus"
+joinedGroups: "Grupos a los que me uní"
 invites: "Invitar"
+groupName: "Nombre del grupo"
+members: "Miembros"
+transfer: "Transferir"
+messagingWithUser: "Chatear con usuario"
+messagingWithGroup: "Chatear en grupo"
+title: "Título"
+text: "Texto"
+enable: "Activar"
+next: "Siguiente"
+retype: "Intentar de nuevo"
+noteOf: "Notas de {user}"
+inviteToGroup: "Invitar al grupo"
+maxNoteTextLength: "Límite de caracteres en una nota"
+quoteAttached: "Cita añadida"
+quoteQuestion: "¿Quiere añadir una cita?"
+noMessagesYet: "Aún no hay chat"
+newMessageExists: "Tienes un mensaje nuevo"
+onlyOneFileCanBeAttached: "Solo se puede añadir un archivo al mensaje"
+signinRequired: "Iniciar sesión"
+invitationCode: "Código de invitación"
+checking: "Comprobando"
+available: "Disponible"
+unavailable: "No disponible"
+usernameInvalidFormat: "utiliza letras, números y/o -."
+tooShort: "Demasiado corto"
+tooLong: "Demasiado largo"
+weakPassword: "Contraseña débil"
+normalPassword: "Buena contraseña"
+strongPassword: "Muy buena contraseña"
+passwordMatched: "Correcto"
+passwordNotMatched: "Las contraseñas no son las mismas"
+signinWith: "Inicie sesión con {x}"
+tapSecurityKey: "Toque la clave de seguridad"
+or: "O"
+uiLanguage: "Idioma de visualización de la interfaz"
+_ago:
+  unknown: "Desconocido"
+  future: "Futuro"
+  justNow: "Recién ahora"
+  secondsAgo: "Hace {n} segundos"
+  minutesAgo: "Hace {n} minutos"
+  hoursAgo: "Hace {n} horas"
+  daysAgo: "Hace {n} días"
+  weeksAgo: "Hace {n} semanas"
+  monthsAgo: "Hace {n} meses"
+  yearsAgo: "Hace {n} años"
+_time:
+  second: "Segundos"
+  minute: "Minutos"
+  hour: "Horas"
+  day: "Días"
+_tutorial:
+  title: "Cómo usar Misskey"
+  step1_1: "Bienvenido"
+  step1_2: "Esta imagen se llama \"Linea de tiempo\" y muestra en orden cronológico las \"notas\" tuyas y de la gente que \"sigues\""
+  step1_3: "Si no estás escribiendo ninguna nota y no estás siguiendo a nadie, es esperable que no se muestre nada en la linea de tiempo"
+  step2_1: "Antes de crear notas y seguir a alguien, primero vamos a crear tu perfil"
+  step2_2: "Si provees información sobre quien eres, será más fácil para que otros usuarios te sigan"
+  step3_1: "¿Has podido crear tu perfil sin problemas?"
+  step3_2: "Con esto, prueba hacer una nota. Aprieta el botón con forma de lápiz que está arriba de la imagen y abre el formulario."
+  step3_3: "Si has escrito el contenido, aprieta el botón que está arriba a la derecha del formulario para postear."
+  step3_4: "¿No se te ocurre un contenido? Prueba con decir \"Empecé a usar Misskey\""
+  step4_1: "¿Has posteado?"
+  step4_2: "Si tu nota puede verse en la linea de tiempo, fue todo un éxito."
+  step5_1: "Luego, ponte a seguir a otra gente y haz que tu linea de tiempo esté más animada."
+  step5_2: "Puedes ver las notas destacadas en {featured} y desde allí seguir a usuarios que te importan. También puedes buscar usuario destacados en {explore}."
+  step5_3: "Para seguir a un usuario, haz click en su avatar para ver su página de usuario y allí apretar el botón \"seguir\""
+  step5_4: "De esa manera, puede pasar un tiempo hasta que el usuario apruebe al seguidor."
+  step6_1: "Si puedes ver en la linea de tiempo las notas de otros usuarios, fue todo un éxito."
+  step6_2: "En las notas de otros usuarios puedes añadir una \"reacción\", para poder responder rápidamente."
+  step6_3: "Para añadir una reacción, haz click en el botón \"+\" de la nota y elige la reacción que prefieras."
+  step7_1: "Así terminó la explicación del funcionamiento básico de Misskey. Eso fue todo."
+  step7_2: "Si quieres conocer más sobre Misskey, prueba con la sección {help}."
+  step7_3: "Así, disfruta de Misskey 🚀"
 _2fa:
+  alreadyRegistered: "Ya has completado la configuración."
   registerDevice: "Registrar dispositivo"
+  registerKey: "Registrar clave"
   step1: "Primero, instale en su dispositivo la aplicación de autenticación {a} o {b} u otra."
   step2: "Luego, escanee con la aplicación el código QR mostrado en pantalla."
   step3: "Para terminar, ingrese el token mostrado en la aplicación."
   step4: "Ahora cuando inicie sesión, ingrese el mismo token"
+  securityKeyInfo: "Se puede configurar el inicio de sesión usando una clave de seguridad de hardware que soporte FIDO2 o con un certificado de huella digital o con un PIN"
 _permissions:
   "read:account": "Ver información de la cuenta"
   "write:account": "Editar información de la cuenta"
@@ -371,8 +444,8 @@ _permissions:
   "write:favorites": "Addministrar favoritos"
   "read:following": "Ver información de seguidor"
   "write:following": "Seguir o dejar de seguir"
-  "read:messaging": "Ver conversación"
-  "write:messaging": "Administrar coversación"
+  "read:messaging": "Ver chat"
+  "write:messaging": "Administrar chat"
   "read:mutes": "Ver usuarios silenciados"
   "write:mutes": "Administrar usuarios silenciados"
   "write:notes": "Crear/borrar notas"
@@ -448,6 +521,7 @@ _visibility:
   followersDescription: "Visible sólo para tus seguidores"
   specified: "Mensaje directo"
   specifiedDescription: "Visible sólo para los usuarios elegidos"
+  localOnly: "Solo local"
 _postForm:
   replyPlaceholder: "Responder a esta nota"
   quotePlaceholder: "Citar esta nota"

locales/fr-FR.yml

@@ -1 +1,820 @@
 ---
+_lang_: "Français"
+monthAndDay: "{day}/{month}"
+search: "Rechercher"
+notifications: "Notifications"
+username: "Nom d'utilisateur·rice"
+password: "Mot de passe"
+fetchingAsApObject: "Récupération depuis le fédiverse"
+ok: "D'accord"
+gotIt: "J'ai compris !"
+cancel: "Annuler"
+enterUsername: "Entrer un nom d'utilisateur·rice"
+renotedBy: "Renoté par {user}"
+noNotes: "Pas de notes"
+noNotifications: "Pas de notifications"
+instance: "Instance"
+settings: "Paramètres"
+profile: "Profil"
+timeline: "Fil d'actualité"
+noAccountDescription: "L'utilisateur·rice n'a pas renseigné de présentation sur son profil"
+login: "Se connecter"
+loggingIn: "Connexion en cours"
+logout: "Se déconnecter"
+signup: "S'enregistrer"
+uploading: "Envoi en cours"
+save: "Enregistrer"
+users: "Utilisateur·rice·s"
+addUser: "Ajouter un·e utilisateur·rice"
+favorite: "Ajouter aux favoris"
+favorites: "Favoris"
+unfavorite: "Retirer des favoris"
+pin: "Épingler sur le profil"
+unpin: "Désépingler"
+copyContent: "Copier le contenu"
+copyLink: "Copier le lien"
+delete: "Supprimer"
+addToList: "Ajouter à une liste"
+sendMessage: "Envoyer un message"
+copyUsername: "Copier le nom d'utilisateur"
+reply: "Répondre"
+loadMore: "Voir plus"
+youGotNewFollower: "Vous a suivi"
+receiveFollowRequest: "Demande de suivi reçue"
+followRequestAccepted: "Suivre la demande acceptée"
+mentions: "Mentions"
+directNotes: "Messages directs"
+importAndExport: "Import et export"
+import: "Importer"
+export: "Exporter"
+files: "Fichier·s"
+download: "Télécharger"
+driveFileDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer le fichier \"{name}\" ? Les notes avec ce fichier joint seront aussi supprimées."
+unfollowConfirm: "Êtes-vous sûr·e ne plus vouloir suivre {name} ?"
+exportRequested: "Vous avez demandé une exportation. Cela pourrait prendre un peu de temps. Une fois l'exportation terminée, le fichier résultant sera ajouté dans le Drive."
+importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
+lists: "Listes"
+noLists: "Aucune liste"
+note: "Note"
+notes: "Notes"
+following: "Abonnements"
+followers: "Abonné·e·s"
+followsYou: "Votre abonné"
+createList: "Créer une liste"
+manageLists: "Gérer les listes"
+error: "Une erreur est survenue"
+retry: "Réessayer"
+enterListName: "Nom de la liste"
+privacy: "Vie privée"
+makeFollowManuallyApprove: "Demandes d’abonnements requiert l’approbation"
+defaultNoteVisibility: "Visibilité par défaut"
+follow: "Abonnement"
+followRequest: "Demande d’abonnement"
+followRequests: "Demandes d’abonnement"
+unfollow: "Se désabonner"
+followRequestPending: "En attente d’approbation"
+enterEmoji: "ou entrez un émoji"
+renote: "Renote"
+unrenote: "Annuler Renote"
+quote: "Citation"
+pinnedNote: "Note épinglée"
+you: "Vous"
+clickToShow: "Cliquer pour afficher"
+sensitive: "Contenu sensible"
+add: "Ajouter"
+reaction: "Réactions"
+reactionSettingDescription: "Personnaliser les émojis à afficher dans le sélecteur de réactions, délimités par les sauts de ligne."
+rememberNoteVisibility: "Se souvenir de la visibilité des notes"
+renameFile: "Renommer le ficher"
+attachCancel: "Enlever le fichier attaché"
+markAsSensitive: "Marquer comme sensible"
+unmarkAsSensitive: "Enlever le marquage comme sensible"
+enterFileName: "Entrer le nom du fichier"
+mute: "Mettre en sourdine"
+unmute: "Enlever la sourdine"
+block: "Bloquer"
+unblock: "Débloquer"
+suspend: "Suspendre"
+unsuspend: "Annuler la suspension"
+blockConfirm: "Désirez-vous bloquer ce compte ?"
+unblockConfirm: "Désirez-vous débloquer ce compte ?"
+suspendConfirm: "Désirez-vous suspendre ce compte ?"
+unsuspendConfirm: "Désirez-vous annuler la suspension de ce compte ?"
+selectList: "Sélectionner une liste"
+customEmojis: "Émojis personnalisés"
+emojiName: "Nom de l’émoji"
+emojiUrl: "URL de l’émoji"
+addEmoji: "Ajouter un émoji"
+cacheRemoteFiles: "Mettre en cache des fichiers distants"
+cacheRemoteFilesDescription: "Quand ce paramètre est désactivé, les fichiers distants sont chargés directement de l'instance distante. Désactiver cela diminuera l'utilisation du stockage mais augmentera le trafic parce les miniatures ne seront pas générées."
+flagAsBot: "Ce compte est un robot"
+flagAsCat: "Ce compte est un chat"
+autoAcceptFollowed: "Approuver automatiquement les abonnements des utilisateurs abonné·e·s"
+addAcount: "Ajouter un compte"
+loginFailed: "Échec de la connexion"
+showOnRemote: "Voir sur l'instance distante"
+general: "Général"
+wallpaper: "Arrière plan"
+removeWallpaper: "Supprimer l'arrière plan"
+searchWith: "Recherche : {q}"
+youHaveNoLists: "Vous n'avez aucune liste"
+followConfirm: "Désirez-vous suivre {name} ?"
+proxyAccount: "Compte proxy"
+proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant pour les utilisateurs d'autres instances.\nExemple : quand un·e utilisateur·rice distant·e est ajouté·e à une liste, ses notes ne serait pas visibles sur l'instance si personne ne le·la suit. Le compte proxy va donc le·la suivre pour que ses notes soient acheminées."
+host: "Hôte"
+selectUser: "Sélectionner un·e utilisateur·rice"
+recipient: "Correspondant·e"
+annotation: "Commentaires"
+federation: "Fédération"
+instances: "Instance"
+registeredAt: "Premier contact le"
+latestRequestSentAt: "Dernière requête envoyée"
+latestRequestReceivedAt: "Dernière requête reçue"
+latestStatus: "Dernière statut"
+storageUsage: "Stockage utilisé"
+charts: "Graphiques"
+perHour: "par heure"
+perDay: "par jour"
+stopActivityDelivery: "Arrêter l'envoi d'activités"
+blockThisInstance: "Bloquer cette instnce"
+operations: "Opérations"
+software: "Logiciel"
+version: "Version"
+metadata: "Métadonnées"
+withNFiles: "{n} fichier(s)"
+monitor: "Écran de contrôle"
+jobQueue: "File d’attente"
+cpuAndMemory: "Processeur et mémoire"
+network: "Réseau"
+disk: "Disque"
+instanceInfo: "Informations sur l'instance"
+statistics: "Statistiques"
+clearQueue: "Vider la file d'attente"
+clearQueueConfirmTitle: "Êtes-vous sûr·e de vouloir vider la file d'attente ?"
+clearQueueConfirmText: "Les notes non distribuées ne seront pas livrées. Normalement, vous n'avez PAS besoin d'effectuer cette opération."
+clearCachedFiles: "Vider le cache"
+clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider le cache de fichiers distants ?"
+blockedInstances: "Instances bloquées"
+blockedInstancesDescription: "Listez les instance que vous désirez bloquer, une par ligne. Ces instances bloquées ne seront pas capable d'interagir avec cette instance."
+muteAndBlock: "Masqués / Bloqués"
+mutedUsers: "Utilisateur·rice·s en sourdine"
+blockedUsers: "Utilisateur·rice·s bloqué·e·s"
+noUsers: "Il n'y a aucun utilisateur·rice"
+editProfile: "Modifier votre profil"
+noteDeleteConfirm: "Confirmez-vous la suppression de cette note ?"
+pinLimitExceeded: "Je ne peux plus épingler"
+done: "Terminé"
+processing: "Traitement en cours"
+preview: "Prévisualisation"
+noCustomEmojis: "Il a pas d’émoji"
+customEmojisOfRemote: "Émojis l'instance distante"
+noJobs: "Il n'y a aucune tâche planifiée"
+federating: "En cours de fédération"
+blocked: "Bloqué"
+suspended: "Suspendu"
+all: "Tous"
+subscribing: "Abonné"
+publishing: "Publié"
+notResponding: "Ne répond pas"
+instanceFollowing: "Abonnements une instance"
+instanceFollowers: "Abonné·e·s de l'instance"
+instanceUsers: "Utilisateur·e·s de l'instance"
+changePassword: "Modifier votre mot de passe"
+security: "Sécurité"
+retypedNotMatch: "Les saisies ne correspondent pas."
+currentPassword: "Mot de passe actuel"
+newPassword: "Nouveau mot de passe"
+newPasswordRetype: "Nouveau mot de passe (répéter)"
+attachFile: "Joindre un fichier"
+more: "Plus !"
+featured: "Surlignage"
+usernameOrUserId: "Nom d'utilisateur ou ID utilisateur"
+noSuchUser: "Utilisateur non trouvé"
+lookup: "Recherche"
+announcements: "Annonces"
+imageUrl: "URL de l’image"
+remove: "Supprimer"
+removed: "Supprimé"
+removeAreYouSure: "Supprimer «{x}» ?"
+saved: "Enregistré"
+messaging: "Discuter"
+upload: "Téléchargez"
+fromDrive: "Depuis le Drive"
+fromUrl: "De l'URL"
+explore: "Découvrir"
+games: "Jeux de Misskey"
+messageRead: "Lus"
+recentUsedEmojis: "Emoji récemment utilisé"
+noMoreHistory: "Plus d'histoire passée"
+startMessaging: "Commencer à écrire un discutez"
+nUsersRead: "{n} personnes ont lu"
+agreeTo: "D'accord {0}"
+tos: "Conditions d'utilisation"
+start: "Commencer"
+home: "Principal"
+remoteUserCaution: "Les informations sont incomplètes en raison de l'utilisateur distant."
+activity: "Activités"
+images: "Images"
+birthday: "Date de naissance"
+yearsOld: "{age} ans"
+registeredDate: "Date de création"
+location: "Localisation"
+theme: "Thème"
+lightThemes: "Thème lumineux"
+darkThemes: "Thème sombre"
+drive: "Drive"
+selectFile: "Choisir le fichier"
+selectFiles: "Choisir le fichiers"
+renameFolder: "Renommer le dossier"
+createFolder: "Créer un dossier"
+deleteFolder: "Supprimer le dossier"
+addFile: "Ajoutez un fichier"
+emptyDrive: "Le Drive est vide"
+emptyFolder: "Le dossier est vide"
+copyUrl: "Copier l’URL"
+rename: "Renommer"
+avatar: "Avatar"
+banner: "Bannière"
+nsfw: "Contenu sensible"
+disconnectedFromServer: "Déconnecté du serveur"
+reloadConfirm: "Voulez-vous recharger?"
+watch: "Surveiller"
+unwatch: "Ne plus surveiller"
+accept: "Autoriser"
+reject: "Refuser"
+instanceName: "Nom de l’instance"
+instanceDescription: "Description de l’instance"
+maintainerName: "Nom d'administrateur"
+maintainerEmail: "Email de l'administrateur"
+tosUrl: "URL des conditions d'utilisation"
+thisYear: "Cette année"
+thisMonth: "Ce mois-ci"
+today: "Aujourd'hui"
+dayX: "{day} jour"
+monthX: "{month} mois"
+yearX: "{year} année"
+pages: "Pages"
+integration: "Intégrations"
+connectSerice: "Connecter"
+disconnectSerice: "Déconnecter"
+enableLocalTimeline: "Activer le fil local"
+enableGlobalTimeline: "Activer le fil global"
+disablingTimelinesInfo: "Si vous désactivez ces le fils, les administrateurs et les modérateurs pourront toujours y accéder pour plus de commodité."
+registration: "S'inscrire"
+enableRegistration: "Autoriser n’importe qui à s’enregistrés"
+invite: "Inviter"
+proxyRemoteFiles: "Proxy fichiers distants"
+driveCapacityPerLocalAccount: "Volume du Drive par utilisateur local"
+driveCapacityPerRemoteAccount: "Volume du Drive par utilisateur distant"
+inMb: "en mégaoctets"
+iconUrl: "URL de l'image de l'icône"
+bannerUrl: "URL de l'image de la bannière"
+basicInfo: "Informations basiques"
+pinnedUsers: "Utilisateur·rice épinglé·e"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Activation de reCAPTCHA"
+recaptchaSiteKey: "Clé du site"
+recaptchaSecretKey: "Clé secrète"
+antennas: "Antenne"
+manageAntennas: "Gestion d'antenne"
+name: "Nom"
+antennaSource: "Recevoir la source"
+antennaKeywords: "Mots clés entrants"
+antennaKeywordsDescription: "Lorsqu'il est séparé par un espace, il devient une spécification ET, et lorsqu'il est séparé par un saut de ligne, il devient une spécification OU."
+notifyAntenna: "Notifier les nouvelles notes"
+withFileAntenna: "Notes uniquement avec fichiers joints"
+serviceworker: "ServiceWorker"
+enableServiceworker: "Activer ServiceWorker"
+antennaUsersDescription: "Spécifiez les noms d'utilisateurs séparés par des sauts de ligne"
+caseSensitive: "Sensible à la casse"
+withReplies: "Y compris répondres"
+connectedTo: "Vous êtes connectés aux services suivants"
+notesAndReplies: "Notes et Répondres"
+withFiles: "Avec fichiers joints"
+silence: "Mettre en masquer"
+silenceConfirm: "Mettre l'utilisateur sous masquer ?"
+unsilenceConfirm: "Voulez-vous annuler le masquer ?"
+popularUsers: "Utilisateur·rice·s populaires"
+recentlyUpdatedUsers: "Utilisateur·rice·s actif·ve·s récemment"
+recentlyRegisteredUsers: "Utilisateur·rice·s récemment enregistrés"
+recentlyDiscoveredUsers: "Utilisateur·rice·s récemment découverts"
+exploreUsersCount: "Il y a {count} utilisateur·rice·s"
+exploreFediverse: "Explorer le Fédiverse"
+popularTags: "Mots-clés populaires"
+userList: "Listes"
+about: "Informations"
+aboutMisskey: "À propos de Misskey"
+patrons: "Supporteurs"
+administrator: "Administrateur"
+token: "Jeton"
+twoStepAuthentication: "Authentification à deux facteurs"
+moderator: "Modérateurs"
+nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
+securityKey: "Clé de sécurité"
+securityKeyName: "Nom de la clé"
+registerSecurityKey: "S’inscrire la clé de sécurité"
+lastUsed: "Dernier utilisé"
+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: "Notes"
+posted: "Publié !"
+autoReloadWhenDisconnected: "Rechargement automatique lorsque le serveur se déconnecte"
+autoNoteWatch: "Surveiller automatique pour les notes"
+reduceUiAnimation: "Réduire l'animation de l'interface"
+share: "Partager"
+notFound: "Non trouvé"
+notFoundDescription: "Aucune page ne correspond à l'URL spécifiée."
+uploadFolder: "Emplacement de téléversement par défaut"
+cacheClear: "Vider le cache"
+markAsReadAllNotifications: "Marquer toutes les notifications comme lues"
+markAsReadAllUnreadNotes: "Marquer toutes les notes comme lues"
+markAsReadAllTalkMessages: "Marquer toutes les discutez comme lues"
+help: "Aide"
+inputMessageHere: "Tapez ici votre message"
+close: "Fermer"
+group: "Groupe"
+groups: "Groupes"
+createGroup: "Créer un groupe"
+ownedGroups: "Groupe propriétaire"
+joinedGroups: "Membre dans les groupes"
+invites: "Inviter"
+groupName: "Nom du groupe"
+members: "Membres"
+transfer: "Transférer"
+messagingWithUser: "Discutez avec les utilisateurs"
+messagingWithGroup: "Discuter en groupe"
+title: "Titre"
+text: "Texte"
+enable: "Activer"
+next: "Suivant"
+retype: "Retapez"
+noteOf: "{user} notes"
+inviteToGroup: "Inviter au groupe"
+maxNoteTextLength: "Limite de note caractères"
+quoteAttached: "Avec citation"
+quoteQuestion: "Souhaitez-vous ajoutez une citation ?"
+noMessagesYet: "Pas encore discuté"
+newMessageExists: "Vous avez un nouveau message"
+onlyOneFileCanBeAttached: "Vous ne pouvez joindre qu'un seul fichier au message"
+signinRequired: "Veuillez vous connecter"
+invitationCode: "Code d’invitation"
+checking: "Vérification"
+available: "Disponible"
+unavailable: "Non disponible"
+usernameInvalidFormat: "Vous pouvez utiliser des lettres, des nombres et _"
+tooShort: "Est trop court"
+tooLong: "Est trop long"
+weakPassword: "Faible mot de passe"
+normalPassword: "Bon mot de passe"
+strongPassword: "Fort mot de passe"
+passwordMatched: "Correcte"
+passwordNotMatched: "Ne correspond pas"
+signinWith: "Connectez-vous avec {x}"
+tapSecurityKey: "Touchez la clé de sécurité"
+or: "OU"
+uiLanguage: "Langue d'affichage de l'interface"
+_ago:
+  unknown: "Inconnu"
+  future: "Futur"
+  justNow: "à l’instant"
+  secondsAgo: "Il y a {n}s"
+  minutesAgo: "Il y a {n}min"
+  hoursAgo: "Il y a {n} heures"
+  daysAgo: "Il y a {n} jours"
+  weeksAgo: "Il y a {n} semaines"
+  monthsAgo: "Il y a {n} mois"
+  yearsAgo: "Il y a {n} ans"
+_time:
+  second: "s"
+  minute: "min"
+  hour: "h"
+  day: "j"
+_tutorial:
+  title: "Comment utiliser Misskey"
+_2fa:
+  alreadyRegistered: "Cette étape à déjà été complétée"
+  registerDevice: "S’inscrire l'appareil"
+  registerKey: "S’inscrire la clé"
+  step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
+  step2: "Ensuite, scannez le code QR affiché avec l'application."
+  step3: "Entrez le jeton affiché sur l'application et vous avez terminé."
+  step4: "Lorsque vous vous connectez, entrez le jeton de la même manière."
+  securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion avec non seulement la clé de sécurité matérielle qui prend en charge FIDO2, mais également l'authentification par empreinte digitale ou PIN sur votre appareil."
+_permissions:
+  "read:account": "Afficher les informations du compte"
+  "write:account": "Mettre à jour les informations de votre compte"
+  "read:blocks": "Voir les blocs"
+  "write:blocks": "Écrire des blocs"
+  "read:drive": "Parcourir le Drive"
+  "write:drive": "Écrire sur le Drive"
+  "read:favorites": "Afficher les favoris"
+  "write:favorites": "Écrire des favoris"
+  "read:following": "Voir les informations de l'abonné"
+  "write:following": "Abonnements/Se désabonner"
+  "read:messaging": "Cherche à discuter"
+  "write:messaging": "Contrôler le discuter"
+  "read:mutes": "Voir les comptes muets"
+  "write:mutes": "Gérer les comptes muets"
+  "write:notes": "Créer / supprimer des notes"
+  "read:notifications": "Afficher les notifications"
+  "write:notifications": "Gérer vos notifications"
+  "read:reactions": "Lire les réactions"
+  "write:reactions": "Gérer vos réactions"
+  "write:votes": "Voter"
+  "read:pages": "Afficher la page"
+  "write:pages": "Mettre à jour les Pages"
+  "read:page-likes": "Lire les favoris sur les Pages"
+  "write:page-likes": "Mettre à jour les favoris sur les Pages"
+  "read:user-groups": "Voir les groupes d'utilisateur·rice·s"
+  "write:user-groups": "Éditer les groupes des utilisateur·rice·s"
+_auth:
+  shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
+  permissionAsk: "Cette application nécessite les autorisations suivantes "
+_antennaSources:
+  all: "Toutes les notes"
+  homeTimeline: "Notes de l'utilisateur auquel je m'abonne"
+  users: "Notes des un ou plusieurs utilisateurs spécifiés"
+  userList: "Notes pour les utilisateurs de la liste spécifiée"
+_weekday:
+  sunday: "Dimanche"
+  monday: "Lundi"
+  tuesday: "Mardi"
+  wednesday: "Mercredi"
+  thursday: "Jeudi"
+  friday: "Vendredi"
+  saturday: "Samedi"
+_widgets:
+  memo: "Note collante"
+  notifications: "Notifications"
+  timeline: "Fil d'actualité"
+  calendar: "Calendrier"
+  trends: "Tendances"
+  clock: "Horloge"
+  rss: "Lecteur de flux RSS"
+_cw:
+  hide: "Masquer"
+  show: "Voir plus"
+  chars: "{count} caractères"
+  files: "{count} fichiers"
+  poll: "Sondage"
+_poll:
+  noOnlyOneChoice: "Au moins 2 réponses nécéssaires"
+  choiceN: "Choix {n}"
+  noMore: "Vous ne pouvez pas en ajouter davantage"
+  canMultipleVote: "Autoriser le multi-choix"
+  expiration: "Fin du sondage"
+  infinite: "Illimité"
+  at: "Choisir une date"
+  after: "Chosir une durée"
+  deadlineDate: "Date de fin"
+  deadlineTime: "Heure de fin"
+  duration: "Durée"
+  votesCount: "{n} votes"
+  totalVotes: "{n} votes au total"
+  vote: "Voter"
+  showResult: "Voir les résultats"
+  voted: "Déjà voté"
+  closed: "Terminé"
+  remainingDays: "{d} jours, {h} heures restantes"
+  remainingHours: "{h} heures et {m} minutes restantes"
+  remainingMinutes: "{m} minutes et {s} secondes restantes"
+  remainingSeconds: "{s} secondes restantes"
+_visibility:
+  public: "Public"
+  publicDescription: "Publier à tou·te·s les utilisateur·rice·s"
+  home: "Principal"
+  homeDescription: "Publier sur le fil principal uniquement"
+  followers: "Abonné·e·s"
+  followersDescription: "Publier à vos abonné·e·s uniquement"
+  specified: "Direct"
+  specifiedDescription: "Publier uniquement aux utilisateur·rice·s mentionné·e·s"
+  localOnly: "Local seulement"
+_postForm:
+  replyPlaceholder: "Répondre à cette note ..."
+  quotePlaceholder: "Citez cette note ..."
+  _placeholders:
+    a: "Qu'est-ce qu'il se passe ?"
+    b: "Quoi de neuf ?"
+    c: "Qu’avez-vous en tête ?"
+    d: "Désirez-vous publier quelques mots ?"
+    e: "Écrivez ici"
+    f: "En attente de vos écrits ..."
+_profile:
+  name: "Nom"
+  username: "Nom d'utilisateur·rice"
+  description: "À propos de moi"
+  youCanIncludeHashtags: "Vous pouvez également inclure des hashtags."
+  metadata: "Informations complémentaires"
+  metadataLabel: "Étiquette"
+  metadataContent: "Contenu"
+_exportOrImport:
+  allNotes: "Toutes les notes"
+  followingList: "Abonnements"
+  muteList: "Mettre en sourdine"
+  blockingList: "Bloquer"
+  userLists: "Listes"
+_charts:
+  federationInstancesIncDec: "Variation du nombre d'instances"
+  federationInstancesTotal: "Nombre d'instances au total"
+  usersIncDec: "Variation du nombre d'utilisateur·rice·s"
+  usersTotal: "Nombre d'utilsateur·rice·s au total"
+  activeUsers: "Utilisateur·rice·s actif·ve·s"
+  notesIncDec: "Variation du nombre d'notes"
+  localNotesIncDec: "Variation du nombre de notes local"
+  remoteNotesIncDec: "Variation du nombre d’notes distant"
+  notesTotal: "Nombre d'notes au total"
+  filesIncDec: "Variation du nombre de fichiers"
+  filesTotal: "Nombre de fichiers au total"
+  storageUsageIncDec: "Variation de l'utilisation du stockage"
+  storageUsageTotal: "Utilisation totale du stockage"
+_instanceCharts:
+  requests: "Requêtes"
+  users: "Variation du nombre d'utilisateur·rice·s"
+  usersTotal: "Somme du nombre d'utilisateur·rice·s accumulés"
+  notes: "Variation du nombre d'notes"
+  notesTotal: "Somme du nombre d’notes accumulés"
+  ff: "Variation des abonné·e·s"
+  ffTotal: "Somme du nombre d'abonnements accumulés"
+  cacheSize: "Variation de la taille du cache"
+  cacheSizeTotal: "Somme de la taille du cache accumulé"
+  files: "Variation du nombre de fichiers"
+  filesTotal: "Somme du nombre de fichiers accumulés"
+_timelines:
+  home: "Principal"
+  local: "Local"
+  social: "Social"
+  global: "Global"
+_pages:
+  newPage: "Créer une page"
+  editPage: "Modifier une page"
+  readPage: "Voir la source"
+  page-created: "Page a été créée !"
+  page-updated: "A mis à jour la page"
+  name-already-exists: "Une page portant le même nom existe déjà"
+  title-invalid-name: "L’URL de la page spécifiée n’est pas valide"
+  text-invalid-name: "Assurez-vous qu'il n'est pas vide"
+  editThisPage: "Éditer cette page"
+  viewSource: "Afficher la source"
+  viewPage: "Afficher la page"
+  like: "Favori"
+  unlike: "Je n’favoris pas"
+  liked-pages: "Pages favoris"
+  my-pages: "Mes pages"
+  inspector: "Inspecteur"
+  content: "Bloc de page"
+  variables: "Variables"
+  more-details: "Description"
+  title: "Titre"
+  url: "URL de page"
+  summary: "Résumé de page"
+  alignCenter: "Centrée"
+  hide-title-when-pinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
+  font: "Police de caractères"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  set-eye-catching-image: "Définir une image attirante"
+  remove-eye-catching-image: "Supprimer une image attirante"
+  chooseBlock: "Ajouter un bloc"
+  selectType: "Choisir un type"
+  enterVariableName: "Veuillez entrer un nom de variable"
+  the-variable-name-is-already-used: "Cette variable est déjà utilisée"
+  content-blocks: "Contenu"
+  input-blocks: "Entrée"
+  special-blocks: "Spécial"
+  post-from-post-form: "Publier ce contenu"
+  posted-from-post-form: "Publié !"
+  blocks:
+    text: "Texte"
+    textarea: "Zone de texte"
+    section: "Section"
+    image: "Images"
+    button: "Bouton"
+    if: "Si"
+    _if:
+      variable: "Variables"
+    post: "Formulaire à publier"
+    _post:
+      text: "Contenu"
+    textInput: "Entrée de textuelle"
+    _textInput:
+      name: "Nom de la variable"
+      text: "Titre"
+      default: "Valeur par défaut"
+    textareaInput: "Entrée de textuelle multiligne"
+    _textareaInput:
+      name: "Nom de la variable"
+      text: "Titre"
+      default: "Valeur par défaut"
+    numberInput: "Entrée numérique"
+    _numberInput:
+      name: "Nom de la variable"
+      text: "Titre"
+      default: "Valeur par défaut"
+    switch: "Basculer"
+    _switch:
+      name: "Nom de la variable"
+      text: "Titre"
+      default: "Valeur par défaut"
+    counter: "Compteur"
+    _counter:
+      name: "Nom de la variable"
+      text: "Titre"
+      inc: "Augmenter le chiffre"
+    _button:
+      text: "Titre"
+      colored: "Coloré"
+      action: "L'opération lorsque le bouton sera pressé"
+      _action:
+        dialog: "Afficher une fenêtre de dialogue"
+        _dialog:
+          content: "Contenu"
+        resetRandom: "Réinitialiser le nombre aléatoire"
+        pushEvent: "Envoyer un évènement"
+        _pushEvent:
+          event: "Nom de l'évènement"
+          message: "Message à afficher lorsque appuyé"
+          variable: "Variable à envoyer"
+          no-variable: "Rien"
+    radioButton: "Choix"
+    _radioButton:
+      name: "Nom de la variable"
+      title: "Titre"
+      values: "Choix séparés par des sauts de ligne"
+      default: "Valeur par défaut"
+  script:
+    categories:
+      flow: "Contrôle"
+      logical: "Opération logique"
+      operation: "Calculer"
+      comparison: "Comparer"
+      random: "Aléatoire"
+      value: "Valeur"
+      fn: "Fonction"
+      text: "Manipulation de texte"
+      convert: "Convertir"
+      list: "Listes"
+    blocks:
+      text: "Texte"
+      multiLineText: "Texte (Multi-lignes)"
+      textList: "Liste de texte"
+      _textList:
+        info: "Veuillez séparer chacun avec une nouvelle ligne"
+      strLen: "Longueur d'un texte"
+      _strLen:
+        arg1: "Texte"
+      strPick: "Extraire un caractère"
+      _strPick:
+        arg1: "Texte"
+        arg2: "Position du joueur"
+      strReplace: "Remplacement de texte"
+      _strReplace:
+        arg1: "Texte"
+        arg2: "Avant le remplacement"
+        arg3: "Après le remplacement"
+      strReverse: "Inverser le texte"
+      _strReverse:
+        arg1: "Texte"
+      join: "Concaténer du texte"
+      _join:
+        arg1: "Listes"
+        arg2: "Séparateur"
+      add: "Ajouter"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "Soustraire"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "Multiplier par"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "Diviser par"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      mod: "Reste"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      round: "Décimal rond"
+      _round:
+        arg1: "Numérique"
+      eq: "A et B sont équivalents"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A et B sont différents"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "A et B"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A ou B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "A est plus petit que B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "A est supérieur à B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "A est plus petit ou égal à B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: "A est supérieur ou égal à B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "Branche"
+      _if:
+        arg1: "Si"
+        arg2: "Si"
+        arg3: "Sinon"
+      not: "Nier"
+      _not:
+        arg1: "Nier"
+      random: "Aléatoire"
+      _random:
+        arg1: "Probabilité"
+      rannum: "Nombre aléatoire"
+      _rannum:
+        arg1: "Minimum"
+        arg2: "Maximum"
+      randomPick: "Sélectionner au hasard dans la liste"
+      _randomPick:
+        arg1: "Listes"
+      dailyRandom: "Aléatoire (Quotidien pour chaque utilisateur)"
+      _dailyRandom:
+        arg1: "Probabilité"
+      dailyRannum: "Numéros aléatoires (Quotidien pour chaque utilisateur)"
+      _dailyRannum:
+        arg1: "Minimum"
+        arg2: "Maximum"
+      dailyRandomPick: "Sélectionné au hasard dans la liste (Quotidien pour chaque utilisateur)"
+      _dailyRandomPick:
+        arg1: "Listes"
+      seedRandom: "Aléatoire (graine)"
+      _seedRandom:
+        arg1: "Graine"
+        arg2: "Probabilité"
+      seedRannum: "Nombre aléatoire (Graine)"
+      _seedRannum:
+        arg1: "Graine"
+        arg2: "Minimum"
+        arg3: "Maximum"
+      seedRandomPick: "Sélectionné au hasard dans la liste (graine)"
+      _seedRandomPick:
+        arg1: "Graine"
+        arg2: "Listes"
+      DRPWPM: "Sélectionné au hasard dans une liste de probabilités (Quotidien pour chaque utilisateur)"
+      _DRPWPM:
+        arg1: "Liste de texte"
+      pick: "Sélectionner dans la liste"
+      _pick:
+        arg1: "Listes"
+        arg2: "Position"
+      listLen: "Longueur de la liste"
+      _listLen:
+        arg1: "Listes"
+      number: "Numérique"
+      stringToNumber: "Convertir du texte en numérique"
+      _stringToNumber:
+        arg1: "Texte"
+      numberToString: "Convertir du numérique en texte"
+      _numberToString:
+        arg1: "Numérique"
+      splitStrByLine: "Séparer le texte par lignes"
+      _splitStrByLine:
+        arg1: "Texte"
+      ref: "Variables"
+      fn: "Fonction"
+      _fn:
+        slots: "Slots"
+        slots-info: "Veuillez délimiter chaque slot par un saut de ligne"
+        arg1: "Sortie"
+      for: "Répéter"
+      _for:
+        arg1: "Compter"
+        arg2: "Action"
+    typeError: "Le slot {slot} accepte \"{expect}\" mais a \"{actual}\" !"
+    thereIsEmptySlot: "Slot {slot} est vide !"
+    types:
+      string: "Texte"
+      number: "Numérique"
+      boolean: "Marqueur"
+      array: "Listes"
+      stringArray: "Liste de texte"
+    emptySlot: "Slot vide"
+    enviromentVariables: "Variables d'environnement"
+    pageVariables: "Élément de page"
+    argVariables: "Entrée slot"

locales/index.js

@@ -19,13 +19,13 @@ const languages = [
 	//'de-DE',
 	'en-US',
 	'es-ES',
-	//'fr-FR',
+	'fr-FR',
 	'ja-JP',
-	//'ja-KS',
+	'ja-KS',
 	'ko-KR',
 	//'nl-NL',
 	//'pl-PL',
-	//'zh-CN',
+	'zh-CN',
 	//'zh-TW',
 ];
 

locales/ja-JP.yml

@@ -1,20 +1,4 @@
-_ago:
-  unknown: "謎"
-  future: "未来"
-  justNow: "たった今"
-  secondsAgo: "{n}秒前"
-  minutesAgo: "{n}分前"
-  hoursAgo: "{n}時間前"
-  daysAgo: "{n}日前"
-  weeksAgo: "{n}週間前"
-  monthsAgo: "{n}ヶ月前"
-  yearsAgo: "{n}年前"
-
-_time:
-  second: "秒"
-  minute: "分"
-  hour: "時間"
-  day: "日"
+_lang_: "日本語"
 
 introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスです。\n「ノート」を作成して、いま起こっていることを共有したり、あなたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加することもできます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
@@ -219,8 +203,6 @@ messaging: "チャット"
 upload: "アップロード"
 fromDrive: "ドライブから"
 fromUrl: "URLから"
-editWidgets: "ウィジェットを編集"
-exitEdit: "編集を終了"
 explore: "みつける"
 games: "Misskey Games"
 messageRead: "既読"
@@ -329,6 +311,7 @@ aboutMisskey: "Misskeyについて"
 aboutMisskeyText: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
 misskeyMembers: "現在以下のメンバーによって開発・メンテナンスされています:"
 misskeySource: "ソースコードはここで公開されています:"
+misskeyTranslation: "Misskeyの翻訳にご協力をお願いします:"
 misskeyDonate: "Misskeyに寄付をして開発をサポートできます:"
 morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
 patrons: "支援者"
@@ -373,6 +356,81 @@ members: "メンバー"
 transfer: "譲渡"
 messagingWithUser: "ユーザーとチャット"
 messagingWithGroup: "グループでチャット"
+title: "タイトル"
+text: "テキスト"
+enable: "有効にする"
+next: "次"
+retype: "再入力"
+noteOf: "{user}のノート"
+inviteToGroup: "グループに招待"
+maxNoteTextLength: "ノートの文字数制限"
+quoteAttached: "引用付き"
+quoteQuestion: "引用として添付しますか？"
+noMessagesYet: "まだチャットはありません"
+newMessageExists: "新しいメッセージがあります"
+onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつです"
+signinRequired: "ログインしてください"
+invitationCode: "招待コード"
+checking: "確認しています"
+available: "利用できます"
+unavailable: "利用できません"
+usernameInvalidFormat: "a~z、A~Z、0~9、_が使えます"
+tooShort: "短すぎます"
+tooLong: "長すぎます"
+weakPassword: "弱いパスワード"
+normalPassword: "普通のパスワード"
+strongPassword: "強いパスワード"
+passwordMatched: "一致しました"
+passwordNotMatched: "一致していません"
+signinWith: "{x}でログイン"
+tapSecurityKey: "セキュリティーキーにタッチ"
+or: "もしくは"
+uiLanguage: "UIの表示言語"
+groupInvited: "グループに招待されました"
+aboutX: "{x}について"
+useOsNativeEmojis: "OSネイティブの絵文字を使用"
+
+_ago:
+  unknown: "謎"
+  future: "未来"
+  justNow: "たった今"
+  secondsAgo: "{n}秒前"
+  minutesAgo: "{n}分前"
+  hoursAgo: "{n}時間前"
+  daysAgo: "{n}日前"
+  weeksAgo: "{n}週間前"
+  monthsAgo: "{n}ヶ月前"
+  yearsAgo: "{n}年前"
+
+_time:
+  second: "秒"
+  minute: "分"
+  hour: "時間"
+  day: "日"
+
+_tutorial:
+  title: "Misskeyの使い方"
+  step1_1: "ようこそ。"
+  step1_2: "この画面は「タイムライン」と呼ばれ、あなたや、あなたが「フォロー」する人の「ノート」が時系列で表示されます。"
+  step1_3: "あなたはまだ何もノートを投稿しておらず、誰もフォローしていないので、タイムラインには何も表示されていないはずです。"
+  step2_1: "ノートを作成したり誰かをフォローしたりする前に、まずあなたのプロフィールを完成させましょう。"
+  step2_2: "あなたがどんな人かわかると、多くの人にノートを見てもらえたり、フォローしてもらいやすくなります。"
+  step3_1: "プロフィール設定はうまくできましたか？"
+  step3_2: "では試しに、何かノートを投稿してみてください。画面上にある鉛筆マークのボタンを押すとフォームが開きます。"
+  step3_3: "内容を書いたら、フォーム右上のボタンを押すと投稿できます。"
+  step3_4: "内容が思いつかない？「Misskey始めました」というのはいかがでしょう。"
+  step4_1: "投稿できましたか？"
+  step4_2: "あなたのノートがタイムラインに表示されていれば成功です。"
+  step5_1: "次は、他の人をフォローしてタイムラインを賑やかにしたいところです。"
+  step5_2: "{featured}で人気のノートが見れるので、その中から気になった人を選んでフォローしたり、{explore}で人気のユーザーを探すこともできます。"
+  step5_3: "ユーザーをフォローするには、ユーザーのアイコンをクリックしてユーザーページを表示し、「フォロー」ボタンを押します。"
+  step5_4: "ユーザーによっては、フォローが承認されるまで時間がかかる場合があります。"
+  step6_1: "タイムラインに他のユーザーのノートが表示されていれば成功です。"
+  step6_2: "他の人のノートには、「リアクション」を付けることができ、簡単にあなたの反応を伝えられます。"
+  step6_3: "リアクションを付けるには、ノートの「+」マークをクリックして、好きなリアクションを選択します。"
+  step7_1: "これで、Misskeyの基本的な使い方の説明は終わりました。お疲れ様でした。"
+  step7_2: "もっとMisskeyについて知りたいときは、{help}を見てみてください。"
+  step7_3: "では、Misskeyをお楽しみください🚀"
 
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"

locales/ja-KS.yml

@@ -1 +1,170 @@
 ---
+_lang_: "日本語 (関西弁)"
+introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作成しぃ、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素はよ反応を追加することもできます✌\n新しい世界を探検しよう🚀"
+monthAndDay: "{month}月 {day}日"
+search: "探す"
+notifications: "通知"
+username: "ユーザー名"
+password: "パスワード"
+fetchingAsApObject: "連合に照会中"
+ok: "おっけー"
+gotIt: "ほい"
+cancel: "やめとくわ"
+enterUsername: "ユーザー名を入れてや"
+renotedBy: "{user}がRenote"
+noNotes: "ノートはあらへん"
+noNotifications: "通知はあらへん"
+instance: "インスタンス"
+settings: "設定"
+profile: "プロフィール"
+timeline: "タイムライン"
+noAccountDescription: "自己紹介はあらへん"
+login: "ログイン"
+loggingIn: "ログインしとります"
+logout: "ログアウト"
+signup: "新規登録"
+uploading: "アップロードしとります"
+save: "保存"
+users: "ユーザー"
+addUser: "ユーザー増やす"
+favorite: "お気に入り"
+favorites: "お気に入り"
+unfavorite: "お気に入りやめる"
+pin: "ピン留め"
+unpin: "ピン留めやめる"
+copyContent: "内容をコピー"
+copyLink: "リンクをコピー"
+delete: "ほかす"
+addToList: "リストに入れたる"
+reply: "返す"
+loadMore: "もっとあるやろ！"
+mentions: "あんた宛て"
+directNotes: "ダイレクト投稿"
+import: "インポート"
+export: "エクスポート"
+files: "ファイル"
+download: "ダウンロード"
+lists: "リスト"
+noLists: "リストはあらへん"
+followsYou: "フォローされとるで"
+error: "問題が発生してん"
+enterListName: "リスト名を入れてや"
+privacy: "プライバシーってなんや？オカンの年齢か？"
+makeFollowManuallyApprove: "他人のフォローは許可してからや！"
+defaultNoteVisibility: "もとからの公開範囲"
+follow: "フォロー"
+followRequest: "フォロー許してくれや！言うてみる"
+followRequests: "フォロー許してくれや！"
+followRequestPending: "フォロー許してくれるん待っとる"
+enterEmoji: "絵文字を入れてや"
+you: "あんた"
+clickToShow: "押してみ、見せたるわ"
+sensitive: "見たらあかんで"
+add: "増やす"
+reaction: "リアクション"
+renameFile: "ファイル名をいらう"
+attachCancel: "くっつけるのやめよか"
+markAsSensitive: "ちょっと見せられへんわ"
+unmarkAsSensitive: "別にええんじゃね？"
+enterFileName: "ファイル名を入れてや"
+mute: "ミュート"
+unmute: "ミュートやめたる"
+block: "ブロック"
+unblock: "ブロックやめたる"
+suspend: "凍結"
+unsuspend: "溶かす"
+customEmojis: "カスタム絵文字"
+cacheRemoteFiles: "リモートのファイルをキャッシュする"
+cacheRemoteFilesDescription: "この設定をチャラにすると、リモートファイルをキャッシュせず直リンクするようになります。サーバーのストレージを節約できますが、サムネイルが生成されへんので通信量が増加します。"
+loginFailed: "ログインに失敗してん"
+wallpaper: "壁紙"
+removeWallpaper: "壁紙ほかす"
+youHaveNoLists: "リストはあらへん"
+proxyAccountDescription: "プロキシアカウントは、代わりにフォローしてくれるアカウントや。例えば、551に豚まんが無いときやったり、ユーザーがリモートユーザーをアカウントに入れたとき、リストに入れられたユーザーが誰からもフォローされてないと寂しいやん。寂しいし、アクティビティも配達されへんから、プロキシアカウントがフォローしてくれるで。ええやつやん…"
+host: "ホスト"
+federation: "連合"
+instances: "インスタンス"
+charts: "チャート"
+perHour: "1時間ごと"
+perDay: "1日ごと"
+operations: "操作"
+version: "バージョン"
+network: "ネットワーク"
+statistics: "統計"
+clearQueueConfirmText: "未配達の投稿は配送されなくなるで。通常この操作を行う必要はあらへんや。"
+muteAndBlock: "ミュートとブロック"
+noUsers: "ユーザーはおらへん"
+pinLimitExceeded: "これ以上ピン留めできひん"
+intro: "Misskeyのインストールが完了してん！管理者アカウントを作ってや。"
+noCustomEmojis: "絵文字はあらへん"
+noJobs: "ジョブはあらへん"
+all: "みな"
+retypedNotMatch: "そやないねん。"
+remove: "ほかす"
+noMoreHistory: "これより過去の履歴はあらへんで"
+nsfw: "見たらあかんで"
+userList: "リスト"
+about: "情報"
+aboutMisskey: "Misskeyってなんや？"
+notFoundDescription: "指定されたURLに該当するページはあらへんやった。"
+close: "さいなら"
+joinedGroups: "参加しとるグループ"
+_ago:
+  unknown: "謎"
+  future: "未来"
+  justNow: "たった今"
+  secondsAgo: "{n}秒前"
+  minutesAgo: "{n}分前"
+  hoursAgo: "{n}時間前"
+  daysAgo: "{n}日前"
+  weeksAgo: "{n}週間前"
+  monthsAgo: "{n}ヶ月前"
+  yearsAgo: "{n}年前"
+_time:
+  second: "秒"
+  minute: "分"
+  hour: "時間"
+  day: "日"
+_2fa:
+  alreadyRegistered: "もう設定終わっとるわ"
+_auth:
+  permissionAsk: "このアプリは次の権限を要求しとるで"
+_antennaSources:
+  all: "みなのノート"
+  homeTimeline: "フォローしとるユーザーのノート"
+_widgets:
+  notifications: "通知"
+  timeline: "タイムライン"
+_cw:
+  show: "もっとあるやろ！"
+_poll:
+  noMore: "これ以上追加でけへん"
+  deadlineTime: "時間"
+_visibility:
+  publicDescription: "みなのユーザーに公開"
+_profile:
+  username: "ユーザー名"
+_exportOrImport:
+  allNotes: "全てのノート"
+  muteList: "ミュート"
+  blockingList: "ブロック"
+  userLists: "リスト"
+_pages:
+  script:
+    categories:
+      list: "リスト"
+    blocks:
+      _join:
+        arg1: "リスト"
+      _randomPick:
+        arg1: "リスト"
+      _dailyRandomPick:
+        arg1: "リスト"
+      _seedRandomPick:
+        arg2: "リスト"
+      _pick:
+        arg1: "リスト"
+      _listLen:
+        arg1: "リスト"
+    types:
+      array: "リスト"

locales/kn-IN.yml

@@ -0,0 +1,2 @@
+---
+_lang_: "ಕನ್ನಡ"

locales/ko-KR.yml

@@ -1,20 +1,5 @@
 ---
-_ago:
-  unknown: "알 수 없음"
-  future: "미래"
-  justNow: "방금 전"
-  secondsAgo: "{n}초 전"
-  minutesAgo: "{n}분 전"
-  hoursAgo: "{n}시간 전"
-  daysAgo: "{n}일 전"
-  weeksAgo: "{n}주 전"
-  monthsAgo: "{n}개월 전"
-  yearsAgo: "{n}년 전"
-_time:
-  second: "초"
-  minute: "분"
-  hour: "시간"
-  day: "일"
+_lang_: "한국어"
 introMisskey: "환영합니다! Misskey 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
 monthAndDay: "{month}월 {day}일"
 search: "검색"
@@ -218,14 +203,12 @@ messaging: "대화"
 upload: "업로드"
 fromDrive: "드라이브에서"
 fromUrl: "URL로부터"
-editWidgets: "위젯 편집"
-exitEdit: "편집 종료"
 explore: "발견하기"
 games: "Misskey Games"
 messageRead: "읽음"
 recentUsedEmojis: "최근에 사용한 이모지"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
-startMessaging: "대화 시작"
+startMessaging: "대화 시작하기"
 nUsersRead: "{n}명이 읽음"
 agreeTo: "{0}에 동의"
 tos: "이용 약관"
@@ -348,6 +331,7 @@ post: "작성"
 posted: "게시하였습니다"
 autoReloadWhenDisconnected: "서버와의 연결이 끊기면 자동 새로고침"
 autoNoteWatch: "노트를 자동으로 지켜보기"
+autoNoteWatchDescription: "리액션하거나 답글을 남긴 다른 유저의 노트에 대한 알림을 받습니다."
 reduceUiAnimation: "UI의 애니메이션을 줄이기"
 share: "공유"
 notFound: "찾을 수 없습니다"
@@ -369,6 +353,77 @@ invites: "초대"
 groupName: "그룹명"
 members: "멤버"
 transfer: "양도"
+messagingWithUser: "유저와 대화하기"
+messagingWithGroup: "그룹끼리 대화하기"
+title: "제목"
+text: "텍스트"
+enable: "사용"
+next: "다음"
+retype: "다시 입력"
+noteOf: "{user}의 노트"
+inviteToGroup: "그룹에 초대하기"
+maxNoteTextLength: "노트의 문자 수 제한"
+quoteAttached: "인용함"
+quoteQuestion: "인용해서 작성하시겠습니까?"
+noMessagesYet: "아직 대화가 없습니다"
+newMessageExists: "새 메시지가 있습니다"
+onlyOneFileCanBeAttached: "메시지에 첨부할 수 있는 파일은 하나까지입니다"
+signinRequired: "로그인 해주세요"
+invitationCode: "초대 코드"
+checking: "확인하는 중입니다"
+available: "사용 가능합니다"
+unavailable: "사용할 수 없습니다"
+usernameInvalidFormat: "a~z, A~Z, 0-9, _를 사용할 수 있습니다"
+tooShort: "너무 짧습니다"
+tooLong: "너무 깁니다"
+weakPassword: "약한 비밀번호"
+normalPassword: "좋은 비밀번호"
+strongPassword: "강한 비밀번호"
+passwordMatched: "일치합니다"
+passwordNotMatched: "일치하지 않습니다"
+signinWith: "{x}로 로그인"
+tapSecurityKey: "보안 키를 터치"
+or: "혹은"
+uiLanguage: "UI 표시 언어"
+_ago:
+  unknown: "알 수 없음"
+  future: "미래"
+  justNow: "방금 전"
+  secondsAgo: "{n}초 전"
+  minutesAgo: "{n}분 전"
+  hoursAgo: "{n}시간 전"
+  daysAgo: "{n}일 전"
+  weeksAgo: "{n}주 전"
+  monthsAgo: "{n}개월 전"
+  yearsAgo: "{n}년 전"
+_time:
+  second: "초"
+  minute: "분"
+  hour: "시간"
+  day: "일"
+_tutorial:
+  title: "Misskey의 사용 방법"
+  step1_1: "환영합니다!"
+  step1_2: "이 페이지는 \"타임라인\"이라고 불립니다. 당신이 \"팔로우\"하고 있는 사람들의 \"노트\"가 시간순으로 나타납니다."
+  step1_3: "아직 아무 유저도 팔로우하고 있지 않기에 타임라인은 비어 있을 것입니다."
+  step2_1: "새 노트를 작성하거나 다른 사람을 팔로우하기 전에, 먼저 프로필을 완성해보도록 합시다."
+  step2_2: "당신이 어떤 사람인지를 알린다면, 다른 사람들이 당신을 팔로우할 확률이 올라갈 것입니다."
+  step3_1: "프로필 설정은 잘 끝내셨나요?"
+  step3_2: "그럼 시험삼아 노트를 작성해 보세요. 화면에 있는 연필 버튼을 누르면 작성 폼이 열립니다."
+  step3_3: "내용을 작성한 후, 폼 오른쪽 상단의 버튼을 눌러 노트를 올릴 수 있습니다."
+  step3_4: "쓸 말이 없나요? \"Misskey 시작했어요!\" 같은 건 어떨까요? :>"
+  step4_1: "노트 작성을 끝내셨나요?"
+  step4_2: "당신의 노트가 타임라인에 표시되어 있다면 성공입니다."
+  step5_1: "이제, 다른 사람을 팔로우하여 타임라인을 활기차게 만들어보도록 합시다."
+  step5_2: "{featured}에서 이 인스턴스의 인기 노트를 보실 수 있습니다. {explore}에서는 인기 사용자를 찾을 수 있구요. 마음에 드는 사람을 골라 팔로우해 보세요!"
+  step5_3: "다른 유저를 팔로우하려면 해당 유저의 아이콘을 클릭하여 프로필 페이지를 띄운 후, 팔로우 버튼을 눌러 주세요."
+  step5_4: "사용자에 따라 팔로우가 승인될 때까지 시간이 걸릴 수 있습니다."
+  step6_1: "타임라인에 다른 사용자의 노트가 나타난다면 성공입니다."
+  step6_2: "다른 유저의 노트에 \"리액션\"을 붙여 간단하게 당신의 반응을 전달할 수도 있습니다."
+  step6_3: "리액션을 붙이려면, 노트의 \"+\" 버튼을 클릭하고 원하는 이모지를 선택합니다."
+  step7_1: "이것으로 Misskey의 기본 튜토리얼을 마치겠습니다. 수고하셨습니다!"
+  step7_2: "Misskey에 대해 더 알고 싶으시다면 {help}를 참고해 주세요."
+  step7_3: "그럼 Misskey를 즐기세요! 🚀"
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerDevice: "디바이스 등록"
@@ -377,34 +432,34 @@ _2fa:
   step2: "그 후, 표시되어 있는 QR코드를 앱으로 스캔합니다."
   step3: "앱에 표시된 토큰을 입력하시면 완료됩니다."
   step4: "다음 로그인부터는 토큰을 입력해야 합니다."
-  securityKeyInfo: "FIDO2를 지원하는 하드웨어 시큐리티 키 혹은 휴대전화의 지문인식이나 화면잠금 PIN을 이용해서 로그인하도록 설정할 수 있습니다."
+  securityKeyInfo: "FIDO2를 지원하는 하드웨어 보안 키 혹은 디바이스의 지문인식이나 화면잠금 PIN을 이용해서 로그인하도록 설정할 수 있습니다."
 _permissions:
-  "read:account": "계정 정보 보기"
-  "write:account": "계정 정보 변경"
-  "read:blocks": "차단 보기"
-  "write:blocks": "차단 수정"
-  "read:drive": "드라이브 보기"
-  "write:drive": "드라이브 수정"
-  "read:favorites": "즐겨찾기 보기"
-  "write:favorites": "즐겨찾기 수정"
-  "read:following": "팔로우 정보 보기"
-  "write:following": "팔로잉 및 팔로우 수정"
-  "read:messaging": "대화 보기"
-  "write:messaging": "대화 수정"
-  "read:mutes": "뮤트 보기"
-  "write:mutes": "뮤트 수정"
-  "write:notes": "노트를 작성하거나 삭제"
-  "read:notifications": "알림 보기"
-  "write:notifications": "알림 수정"
-  "read:reactions": "리액션 보기"
-  "write:reactions": "리액션 수정"
-  "write:votes": "투표하기"
-  "read:pages": "페이지 보기"
-  "write:pages": "페이지 수정"
-  "read:page-likes": "페이지의 좋아요 보기"
-  "write:page-likes": "페이지의 좋아요 수정"
-  "read:user-groups": "유저 그룹 조회"
-  "write:user-groups": "유저 그룹 변경"
+  "read:account": "계정의 정보를 봅니다"
+  "write:account": "계정의 정보를 변경합니다"
+  "read:blocks": "차단 여부를 확인합니다"
+  "write:blocks": "차단을 하거나 해제합니다"
+  "read:drive": "드라이브를 조회합니다"
+  "write:drive": "드라이브에 파일을 올리거나, 이름을 변경하거나, 삭제합니다"
+  "read:favorites": "즐겨찾기를 조회합니다"
+  "write:favorites": "즐겨찾기에 추가하거나 삭제합니다"
+  "read:following": "팔로우 상태를 봅니다"
+  "write:following": "팔로우하거나 팔로우를 해제합니다"
+  "read:messaging": "대화를 읽습니다"
+  "write:messaging": "대화를 시작하거나 메시지를 보냅니다"
+  "read:mutes": "뮤트 여부를 확인합니다"
+  "write:mutes": "뮤트를 하거나 해제합니다"
+  "write:notes": "노트를 작성하거나 삭제합니다"
+  "read:notifications": "알림을 확인합니다"
+  "write:notifications": "알림을 모두 읽음 처리합니다"
+  "read:reactions": "리액션을 확인합니다"
+  "write:reactions": "리액션을 추가하거나 취소합니다"
+  "write:votes": "투표를 합니다"
+  "read:pages": "페이지를 봅니다"
+  "write:pages": "페이지를 수정합니다"
+  "read:page-likes": "페이지의 좋아요를 확인합니다"
+  "write:page-likes": "페이지의 좋아요를 추가하거나 삭제합니다"
+  "read:user-groups": "유저 그룹을 조회합니다"
+  "write:user-groups": "유저 그룹을 만들거나, 초대하거나, 이름을 변경하거나, 양도하거나, 삭제합니다"
 _auth:
   shareAccess: "\"{name}\" 이 계정에 접근하는 것을 허용하시겠습니까?"
   permissionAsk: "이 앱은 다음의 권한을 요청합니다"
@@ -466,6 +521,7 @@ _visibility:
   followersDescription: "팔로워에게만 공개"
   specified: "다이렉트"
   specifiedDescription: "지정한 유저에게만 공개"
+  localOnly: "로컬에만"
 _postForm:
   replyPlaceholder: "이 노트에 답글..."
   quotePlaceholder: "이 노트를 인용..."

locales/nl-NL.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Nederlands"

locales/no-NO.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Norsk Bokmål"

locales/pl-PL.yml

@@ -1 +1,2 @@
 ---
+_lang_: "język polski"

locales/pt-PT.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Português"

locales/ru-RU.yml

@@ -1 +1,2 @@
 ---
+_lang_: "Русский язык"

locales/zh-CN.yml

@@ -1,21 +1,6 @@
 ---
-_ago:
-  unknown: "未知"
-  future: "未来"
-  justNow: "最近"
-  secondsAgo: "{n}秒前"
-  minutesAgo: "{n}分前"
-  hoursAgo: "{n}小时前"
-  daysAgo: "{n}日前"
-  weeksAgo: "{n}周前"
-  monthsAgo: "{n}月前"
-  yearsAgo: "{n}年前"
-_time:
-  second: "秒"
-  minute: "分"
-  hour: "小时"
-  day: "日"
-introMisskey: "欢迎！Misskey是一个开源的分散型SNS服务。\n通过「Note」来分享现在发生的事情吧！📡\n「反应」工能也可以让你快速的对大家的「Note」来表达感情👍\n一起来探索新的世界吧！🚀"
+_lang_: "中文(简体)"
+introMisskey: "欢迎！Misskey是一个开源的分散型SNS服务。\n通过「帖子」来分享现在发生的事情吧！📡\n「反应」功能，可以让你快速的对大家的「帖子」来表达感情👍\n一起来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
 notifications: "通知"
@@ -27,6 +12,7 @@ gotIt: "我明白了"
 cancel: "取消"
 enterUsername: "输入用户名"
 renotedBy: "由 {user} 转推"
+noNotes: "没有投稿"
 noNotifications: "无通知"
 instance: "实例"
 settings: "设置"
@@ -54,13 +40,24 @@ sendMessage: "发送"
 copyUsername: "复制用户名"
 reply: "回复"
 loadMore: "查看更多"
+youGotNewFollower: "你有新的关注者"
+receiveFollowRequest: "收到关注请求"
+followRequestAccepted: "同意关注请求"
+mentions: "提及"
+directNotes: "指定用户可见"
 importAndExport: "导入和导出"
 import: "导入"
 export: "导出"
 files: "文件"
 download: "下载"
+driveFileDeleteConfirm: "要删除「{name}」文件吗？附加此文件的帖子也会消失。"
+unfollowConfirm: "要取消对{name}的关注吗？"
+exportRequested: "导出请求已提交。可能需要花一些时间。导出的文件将保存到网盘中。"
+importRequested: "导入请求已提交。这可能需要花一点时间。"
 lists: "列表"
 noLists: "列表为空"
+note: "帖子"
+notes: "帖子"
 following: "关注中"
 followers: "关注者"
 followsYou: "关注了你"
@@ -81,15 +78,18 @@ enterEmoji: "输入Emoji"
 renote: "转发"
 unrenote: "取消转发"
 quote: "引用"
+pinnedNote: "已置顶的帖子"
 you: "您"
 clickToShow: "点击以显示"
 sensitive: "阅读注意"
 add: "添加"
 reaction: "反应"
 reactionSettingDescription: "快速选择回应中的自定义表情符号，以换行符分隔。"
+rememberNoteVisibility: "记录公开范围"
 renameFile: "重命名文件"
 attachCancel: "删除附件"
 markAsSensitive: "阅读注意"
+unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "请输入文件名"
 mute: "屏蔽"
 unmute: "解除屏蔽"
@@ -107,14 +107,20 @@ emojiName: "Emoji 名称"
 emojiUrl: "emoji 地址"
 addEmoji: "添加Emoji"
 cacheRemoteFiles: "远程文件缓存"
+cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程实例载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这个账户是Bot"
 flagAsCat: "这个账户是Cat"
+autoAcceptFollowed: "自动允许关注"
 addAcount: "添加账户"
 loginFailed: "登录失败"
+showOnRemote: "转到所在实例显示"
 general: "常规设置"
 wallpaper: "壁纸"
 removeWallpaper: "移除壁纸"
 searchWith: "搜索:{q}"
+youHaveNoLists: "列表为空"
+followConfirm: "你确定要关注{name}吗？"
+proxyAccount: "代理账户"
 host: "主机名"
 selectUser: "选择用户"
 recipient: "收件人"
@@ -124,36 +130,51 @@ instances: "实例"
 latestRequestSentAt: "上次发送的请求"
 latestRequestReceivedAt: "上次收到的请求"
 storageUsage: "已用存储"
+charts: "图表"
 perHour: "每小时"
 perDay: "每天"
 operations: "操作"
 software: "软件"
 version: "版本"
 metadata: "元数据"
+withNFiles: "{n}个文件"
 monitor: "监视器"
 jobQueue: "作业队列"
 cpuAndMemory: "CPU使用量"
 network: "网络"
 disk: "存储"
+instanceInfo: "实例情报"
 statistics: "统计"
 clearQueue: "清除队列"
+clearQueueConfirmTitle: "确定清除队列？"
 clearCachedFiles: "清除缓存"
+clearCachedFilesConfirm: "确定要清除缓存文件？"
+blockedInstances: "被阻拦的实例"
+blockedInstancesDescription: "设定要阻拦的实例，以换行来进行分割。被阻拦的实例将无法与本实例进行交换通讯。"
 muteAndBlock: "屏蔽/拉黑"
 mutedUsers: "禁言用户"
 blockedUsers: "已屏蔽用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
+noteDeleteConfirm: "要删除该帖子吗？"
+pinLimitExceeded: "无法置顶更多了"
+intro: "Misskey的部署结束啦！填写管理员账号吧！"
 done: "完成"
 processing: "处理中"
 preview: "预览"
 noCustomEmojis: "无自定义Emoji"
+customEmojisOfRemote: "远程Emoji"
+noJobs: "没有任务"
 federating: "联合中"
 blocked: "已拦截"
+suspended: "停止推流"
 all: "全部"
 subscribing: "已订阅"
+publishing: "直播中"
 notResponding: "没有响应"
 instanceFollowing: "关注实例"
 instanceFollowers: "关注实例"
+instanceUsers: "实例用户"
 changePassword: "修改密码"
 security: "安全性"
 retypedNotMatch: "两次输入不一致！"
@@ -162,8 +183,11 @@ newPassword: "新密码"
 newPasswordRetype: "重新输入密码："
 attachFile: "插入附件"
 more: "更多！"
-featured: "高亮"
+featured: "热门"
+usernameOrUserId: "用户名或用户ID"
+noSuchUser: "用户不存在"
 lookup: "查询"
+announcements: "公告"
 imageUrl: "图片URL"
 remove: "删除"
 removed: "已删除"
@@ -171,17 +195,20 @@ removeAreYouSure: "要删掉「{x}」吗？"
 saved: "已保存"
 messaging: "聊天"
 upload: "上传"
+fromDrive: "从网盘中"
 fromUrl: "从 URL"
-editWidgets: "编辑部件"
-exitEdit: "停止编辑"
 explore: "发现"
 games: "Misskey游戏"
 messageRead: "已读"
 recentUsedEmojis: "最近使用的Emoji表情"
 noMoreHistory: "没有更多的历史记录"
+startMessaging: "开始聊天"
+nUsersRead: "{n}人已读"
+agreeTo: "{0}人同意"
 tos: "服务条款"
 start: "开始"
 home: "首页"
+remoteUserCaution: "由于是远程用户，信息不完整。"
 activity: "活动"
 images: "图片"
 birthday: "生日"
@@ -207,6 +234,8 @@ banner: "Banner"
 nsfw: "阅读注意"
 disconnectedFromServer: "已从服务器断开连接"
 reloadConfirm: "确定要重新加载吗"
+watch: "关注"
+unwatch: "取消关注"
 accept: "允许"
 reject: "拒绝"
 instanceName: "实例名称"
@@ -226,6 +255,7 @@ connectSerice: "已连接"
 disconnectSerice: "断开连接"
 enableLocalTimeline: "启用本地时间线功能"
 enableGlobalTimeline: "启用全局时间线"
+disablingTimelinesInfo: "即使时间线功能被禁用，出于便利性的原因，管理员和数据图表也可以继续使用。"
 registration: "注册"
 enableRegistration: "允许新用户注册"
 invite: "邀请"
@@ -238,11 +268,13 @@ iconUrl: "图标URL"
 bannerUrl: "Banner URL"
 basicInfo: "基本信息"
 pinnedUsers: "置顶用户"
+pinnedUsersDescription: "在「发现」页面中使用换行标记想要置顶的用户。"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)"
 recaptchaSiteKey: "网站密钥"
 recaptchaSecretKey: "reCAPTCHA 密钥"
 name: "名称"
+antennaKeywordsDescription: "使用空格分隔会产生AND规范，并且使用换行符分隔会产生OR规范"
 serviceworker: "ServiceWorker"
 enableServiceworker: "启用ServiceWorker"
 caseSensitive: "区分大小写"
@@ -256,6 +288,8 @@ popularUsers: "热门用户"
 recentlyUpdatedUsers: "最近投稿用户"
 recentlyRegisteredUsers: "最近登录用户"
 recentlyDiscoveredUsers: "最近发现的用户"
+exploreUsersCount: "有{count}个用户"
+exploreFediverse: "探索Fediverse"
 popularTags: "热门标签"
 userList: "列表"
 about: "关于"
@@ -280,6 +314,8 @@ newPasswordIs: "新的密码是「{password}」"
 post: "投稿"
 posted: "已投稿"
 autoReloadWhenDisconnected: "断开连接时自动重新加载"
+autoNoteWatch: "自动关注帖子"
+autoNoteWatchDescription: "让您能够收到关于「反应」和回复其他用户的帖子的通知。"
 reduceUiAnimation: "减少UI动画"
 share: "分享"
 notFound: "未找到"
@@ -287,7 +323,6 @@ uploadFolder: "默认上传文件夹"
 cacheClear: "清空缓存"
 markAsReadAllNotifications: "将所有通知标为已读"
 markAsReadAllUnreadNotes: "将所有帖子标记为已读"
-markAsReadAllTalkMessages: "将所有对话标为已读"
 help: "帮助"
 inputMessageHere: "在此键入信息"
 close: "关闭"
@@ -300,6 +335,33 @@ invites: "邀请"
 groupName: "群组名"
 members: "成员"
 transfer: "转让"
+title: "标题"
+text: "文本"
+enable: "启用"
+next: "下一个"
+retype: "重新输入"
+noteOf: "{user}的帖子"
+inviteToGroup: "群组邀请"
+maxNoteTextLength: "帖子的字数限制"
+_ago:
+  unknown: "未知"
+  future: "未来"
+  justNow: "最近"
+  secondsAgo: "{n}秒前"
+  minutesAgo: "{n}分前"
+  hoursAgo: "{n}小时前"
+  daysAgo: "{n}日前"
+  weeksAgo: "{n}周前"
+  monthsAgo: "{n}月前"
+  yearsAgo: "{n}年前"
+_time:
+  second: "秒"
+  minute: "分"
+  hour: "小时"
+  day: "日"
+_tutorial:
+  title: "Misskey的使用方法"
+  step1_1: "欢迎！"
 _2fa:
   alreadyRegistered: "此设备已被注册"
   registerDevice: "注册设备"
@@ -315,8 +377,6 @@ _permissions:
   "write:favorites": "编辑收藏夹"
   "read:following": "查看关注信息"
   "write:following": "关注/取消关注"
-  "read:messaging": "查看对话"
-  "write:messaging": "对话操作"
   "read:mutes": "查看屏蔽列表"
   "write:mutes": "编辑屏蔽列表"
   "read:notifications": "查看通知"
@@ -381,19 +441,32 @@ _visibility:
   home: "首页"
   followers: "关注者"
   specified: "指定用户"
+  localOnly: "仅限本地"
 _profile:
   name: "名称"
   username: "用户名"
+  description: "个人简介"
+  metadata: "额外信息"
+  metadataLabel: "标签"
+  metadataContent: "内容"
 _exportOrImport:
+  allNotes: "所有帖子"
   followingList: "关注中"
   muteList: "屏蔽"
   blockingList: "屏蔽"
   userLists: "列表"
 _charts:
+  federationInstancesIncDec: "联合：增加/减少"
+  federationInstancesTotal: "联合总数"
   usersIncDec: "用户数量：增加/减少"
+  usersTotal: "用户总数"
+  activeUsers: "活跃用户数"
+  notesIncDec: "帖子：增加/减少"
+  notesTotal: "帖子总数"
 _instanceCharts:
   users: "用户数量：增加/减少"
   usersTotal: "用户总数"
+  notes: "帖子：增加/减少"
   ff: "关注/被关注：数量变化"
   ffTotal: "关注/被关注：总数"
   cacheSize: "缓存大小：增加/减少"
@@ -405,6 +478,7 @@ _timelines:
 _pages:
   newPage: "创建页面"
   editPage: "编辑页面"
+  readPage: "查看源"
   page-created: "页面已创建"
   page-updated: "页面已更新"
   name-already-exists: "该页面URL已存在"
@@ -446,10 +520,17 @@ _pages:
   posted-from-post-form: "已发布"
   blocks:
     text: "文本"
+    textarea: "文本区域"
+    section: "章节"
     image: "图片"
+    button: "按钮"
+    if: "如果"
     _if:
       variable: "变量"
     post: "投稿窗口"
+    _post:
+      text: "内容"
+    textInput: "文本输入"
     _textInput:
       name: "变量名"
       text: "标题"
@@ -482,12 +563,30 @@ _pages:
         dialog: "显示对话框"
         _dialog:
           content: "内容"
+        resetRandom: "重置随机值"
+        pushEvent: "发送事件"
+        _pushEvent:
+          event: "事件名称"
+          message: "按下时显示的消息"
+          variable: "发送的变量"
+          no-variable: "空"
+    radioButton: "选择项"
     _radioButton:
       name: "变量名"
       title: "标题"
+      values: "使用换行区分的选择项"
       default: "默认值"
   script:
     categories:
+      flow: "控制"
+      logical: "逻辑运算"
+      operation: "计算"
+      comparison: "比较"
+      random: "随机"
+      value: "值"
+      fn: "函数"
+      text: "文本操作"
+      convert: "转换"
       list: "列表"
     blocks:
       text: "文本"
@@ -633,17 +732,22 @@ _pages:
       ref: "变量"
       fn: "函数"
       _fn:
+        slots: "槽函数"
+        slots-info: "请使用换行符分隔每个槽函数"
         arg1: "输出"
       for: "重复"
       _for:
         arg1: "次数"
         arg2: "处理"
+    typeError: "槽函数{slot}需要传入“{expect}”，但是实际传入为“{actual}”！"
+    thereIsEmptySlot: "槽函数{slot}为空！"
     types:
       string: "文字"
       number: "数值"
       boolean: "Flag"
       array: "列表"
       stringArray: "文本列表"
+    emptySlot: "空白槽函数"
     enviromentVariables: "环境变量"
     pageVariables: "页面元素"
     argVariables: "输入变量"

locales/zh-TW.yml

@@ -1 +1,2 @@
 ---
+_lang_: "中文(繁体)"

migration/1581526429287-user-group-invitation.ts

@@ -0,0 +1,38 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class userGroupInvitation1581526429287 implements MigrationInterface {
+    name = 'userGroupInvitation1581526429287'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "user_group_invitation" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_160c63ec02bf23f6a5c5e8140d6" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_bfbc6305547539369fe73eb144" ON "user_group_invitation" ("userId") `, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_5cc8c468090e129857e9fecce5" ON "user_group_invitation" ("userGroupId") `, undefined);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e9793f65f504e5a31fbaedbf2f" ON "user_group_invitation" ("userId", "userGroupId") `, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ADD "userGroupInvitationId" character varying(32)`, undefined);
+        await queryRunner.query(`ALTER TYPE "public"."notification_type_enum" RENAME TO "notification_type_enum_old"`, undefined);
+        await queryRunner.query(`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited')`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum" USING "type"::"text"::"notification_type_enum"`, undefined);
+        await queryRunner.query(`DROP TYPE "notification_type_enum_old"`, undefined);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS 'The type of the Notification.'`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_bfbc6305547539369fe73eb144a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_group_invitation" ADD CONSTRAINT "FK_5cc8c468090e129857e9fecce5a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_8fe87814e978053a53b1beb7e98" FOREIGN KEY ("userGroupInvitationId") REFERENCES "user_group_invitation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_8fe87814e978053a53b1beb7e98"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_5cc8c468090e129857e9fecce5a"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_group_invitation" DROP CONSTRAINT "FK_bfbc6305547539369fe73eb144a"`, undefined);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."type" IS ''`, undefined);
+        await queryRunner.query(`CREATE TYPE "notification_type_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ALTER COLUMN "type" TYPE "notification_type_enum_old" USING "type"::"text"::"notification_type_enum_old"`, undefined);
+        await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
+        await queryRunner.query(`ALTER TYPE "notification_type_enum_old" RENAME TO  "notification_type_enum"`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "userGroupInvitationId"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_e9793f65f504e5a31fbaedbf2f"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_5cc8c468090e129857e9fecce5"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_bfbc6305547539369fe73eb144"`, undefined);
+        await queryRunner.query(`DROP TABLE "user_group_invitation"`, undefined);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.4.1",
+	"version": "12.8.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -36,6 +36,7 @@
 		"@fortawesome/free-regular-svg-icons": "5.12.0",
 		"@fortawesome/free-solid-svg-icons": "5.12.0",
 		"@fortawesome/vue-fontawesome": "0.1.9",
+		"@juggle/resize-observer": "3.0.2",
 		"@koa/cors": "3.0.0",
 		"@koa/multer": "2.0.2",
 		"@koa/router": "8.0.6",

src/client/app.vue

@@ -18,8 +18,12 @@
 			</transition>
 		</div>
 		<div class="sub">
+			<button v-if="widgetsEditMode" class="_button edit active" @click="widgetsEditMode = false"><fa :icon="faGripVertical"/></button>
+			<button v-else class="_button edit" @click="widgetsEditMode = true"><fa :icon="faGripVertical"/></button>
+			<div class="search">
 				<fa :icon="faSearch"/>
-			<input type="search" class="search" :placeholder="$t('search')" v-model="searchQuery" v-autocomplete="{ model: 'searchQuery' }" :disabled="searchWait" @keypress="searchKeypress"/>
+				<input type="search" :placeholder="$t('search')" v-model="searchQuery" v-autocomplete="{ model: 'searchQuery' }" :disabled="searchWait" @keypress="searchKeypress"/>
+			</div>
 			<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
 		</div>
 	</header>
@@ -86,7 +90,7 @@
 		</nav>
 	</transition>
 
-	<div class="contents">
+	<div class="contents" ref="contents">
 		<main ref="main">
 			<div class="content">
 				<transition :name="$store.state.device.animation ? 'page' : ''" mode="out-in" @enter="onTransition">
@@ -126,8 +130,6 @@
 					<template v-else>
 						<component class="widget" v-for="widget in widgets" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget"/>
 					</template>
-					<button ref="widgetsEditButton" v-if="widgetsEditMode" class="_button edit" @click="widgetsEditMode = false">{{ $t('exitEdit') }}</button>
-					<button ref="widgetsEditButton" v-else class="_button edit" @click="widgetsEditMode = true">{{ $t('editWidgets') }}</button>
 				</template>
 			</div>
 		</div>
@@ -150,11 +152,12 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faChevronLeft, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faListUl, faPlus, faUserClock, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faGamepad, faServer, faFileAlt, faSatellite, faInfoCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
+import { faGripVertical, faChevronLeft, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faListUl, faPlus, faUserClock, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faGamepad, faServer, faFileAlt, faSatellite, faInfoCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { faBell, faEnvelope, faLaugh, faComments } from '@fortawesome/free-regular-svg-icons';
+import { ResizeObserver } from '@juggle/resize-observer';
 import { v4 as uuid } from 'uuid';
 import i18n from './i18n';
-import { host } from './config';
+import { host, instanceName } from './config';
 import { search } from './scripts/search';
 import contains from './scripts/contains';
 import MkToast from './components/toast.vue';
@@ -184,7 +187,7 @@ export default Vue.extend({
 			enableWidgets: window.innerWidth >= 1100,
 			canBack: false,
 			disconnectedDialog: null as Promise<void> | null,
-			faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer
+			faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer
 		};
 	},
 
@@ -193,12 +196,13 @@ export default Vue.extend({
 			return {
 				'p': this.post,
 				'n': this.post,
+				's': this.search,
 				'h|/': this.help
 			};
 		},
 
 		widgets(): any[] {
-			return this.$store.state.settings.widgets;
+			return this.$store.state.deviceUser.widgets;
 		}
 	},
 
@@ -229,19 +233,29 @@ export default Vue.extend({
 			this.connection.on('notification', this.onNotification);
 
 			if (this.widgets.length === 0) {
-				this.$store.dispatch('settings/setWidgets', [{
-					name: 'notifications',
+				this.$store.commit('deviceUser/setWidgets', [{
+					name: 'calendar',
 					id: 'a', data: {}
+				}, {
+					name: 'notifications',
+					id: 'b', data: {}
+				}, {
+					name: 'trends',
+					id: 'c', data: {}
 				}]);
 			}
 		}
 
 		this.$root.stream.on('_disconnected_', () => {
-			if (!this.disconnectedDialog) {
+			if (this.disconnectedDialog) return;
 			if (this.$store.state.device.autoReload) {
 				location.reload();
 				return;
 			}
+
+			setTimeout(() => {
+				if (this.$root.stream.state !== 'reconnecting') return;
+
 				this.disconnectedDialog = this.$root.dialog({
 					type: 'warning',
 					showCancelButton: true,
@@ -253,23 +267,36 @@ export default Vue.extend({
 					}
 					this.disconnectedDialog = null;
 				});
-			}
+			}, 150)
 		});
+	},
 
-		setInterval(() => {
-			if (this.showNav) return; // TODO: トランジション中も false になるので、これだけでは不十分
-			this.$refs.title.style.left = (this.$refs.main.getBoundingClientRect().left - this.$refs.nav.offsetWidth) + 'px';
-		}, 1000);
-
+	mounted() {
 		// https://stackoverflow.com/questions/33891709/when-flexbox-items-wrap-in-column-mode-container-does-not-grow-its-width
 		if (this.enableWidgets) {
-			setInterval(() => {
-				if (!this.$refs.widgetsEditButton) return;
+			const adjustWidgetsWidth = () => {
+				const lastChild = this.$refs.widgets.children[this.$refs.widgets.children.length - 1];
+				if (lastChild == null) return;
 
-				const width = this.$refs.widgetsEditButton.offsetLeft + 300;
+				const width = lastChild.offsetLeft + 300 + 16;
 				this.$refs.widgets.style.width = width + 'px';
-			}, 1000);
+			};
+			setInterval(adjustWidgetsWidth, 1000);
 		}
+
+		const adjustTitlePosition = () => {
+			this.$refs.title.style.left = (this.$refs.main.getBoundingClientRect().left - this.$refs.nav.offsetWidth) + 'px';
+		};
+
+		adjustTitlePosition();
+
+		const ro = new ResizeObserver((entries, observer) => {
+			adjustTitlePosition();
+		});
+		
+		ro.observe(this.$refs.contents);
+
+		window.addEventListener('resize', adjustTitlePosition);
 	},
 
 	methods: {
@@ -454,9 +481,14 @@ export default Vue.extend({
 					icon: faQuestionCircle,
 				}, {
 					type: 'link',
-					text: this.$t('about'),
+					text: this.$t('aboutX', { x: instanceName || host }),
 					to: '/about',
 					icon: faInfoCircle,
+				}, {
+					type: 'link',
+					text: this.$t('aboutMisskey'),
+					to: '/about-misskey',
+					icon: faInfoCircle,
 				}],
 				align: 'left',
 				fixed: true,
@@ -481,9 +513,10 @@ export default Vue.extend({
 				this.$store.dispatch('switchAccount', {
 					...i,
 					token: token
-				});
+				}).then(() => {
 					location.reload();
 				});
+			});
 		},
 
 		onNotification(notification) {
@@ -529,7 +562,7 @@ export default Vue.extend({
 				items: widgets.map(widget => ({
 					text: this.$t('_widgets.' + widget),
 					action: () => {
-						this.$store.dispatch('settings/addWidget', {
+						this.$store.commit('deviceUser/addWidget', {
 							name: widget,
 							id: uuid(),
 							data: {}
@@ -541,11 +574,11 @@ export default Vue.extend({
 		},
 
 		removeWidget(widget) {
-			this.$store.dispatch('settings/removeWidget', widget);
+			this.$store.commit('deviceUser/removeWidget', widget);
 		},
 
 		saveHome() {
-			this.$store.dispatch('settings/setWidgets', this.widgets);
+			this.$store.commit('deviceUser/setWidgets', this.widgets);
 		}
 	}
 });
@@ -708,20 +741,21 @@ export default Vue.extend({
 				display: none;
 			}
 
-			> [data-icon] {
-				position: absolute;
-				top: 0;
-				left: 16px;
-				height: $header-height;
-				pointer-events: none;
-				font-size: 16px;
+			> .edit {
+				padding: 16px;
+
+				&.active {
+					color: var(--accent);
+				}
 			}
 
 			> .search {
-				$margin: 8px;
-				width: calc(100% - #{$post-button-size + $post-button-margin + $margin});
+				position: relative;
+
+				> input {
+					width: 210px;
 					box-sizing: border-box;
-				margin-right: $margin;
+					margin-right: 8px;
 					padding: 0 12px 0 42px;
 					font-size: 1rem;
 					line-height: 38px;
@@ -735,6 +769,16 @@ export default Vue.extend({
 					}
 				}
 
+				> [data-icon] {
+					position: absolute;
+					top: 0;
+					left: 16px;
+					height: 100%;
+					pointer-events: none;
+					font-size: 16px;
+				}
+			}
+
 			> .post {
 				width: $post-button-size;
 				height: $post-button-size;
@@ -802,7 +846,8 @@ export default Vue.extend({
 				padding: 8px 0;
 
 				> .divider {
-					margin: 8px 0;
+					margin: 8px auto;
+					width: calc(100% - 32px);
 				}
 			}
 
@@ -970,12 +1015,6 @@ export default Vue.extend({
 					margin: 0 auto;
 				}
 
-				> .edit {
-					display: block;
-					font-size: 0.9em;
-					margin: 0 auto;
-				}
-
 				.customize-container {
 					margin: 8px 0;
 					background: #fff;

src/client/components/autocomplete.vue

@@ -18,7 +18,7 @@
 	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
-			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
+			<span class="emoji" v-else-if="!useOsNativeEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
 			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
@@ -130,8 +130,8 @@ export default Vue.extend({
 			return (this.$refs.suggests as Element).children;
 		},
 
-		useOsDefaultEmojis(): boolean {
-			return this.$store.state.device.useOsDefaultEmojis;
+		useOsNativeEmojis(): boolean {
+			return this.$store.state.device.useOsNativeEmojis;
 		}
 	},
 
@@ -143,7 +143,7 @@ export default Vue.extend({
 		this.setPosition();
 
 		//#region Construct Emoji DB
-		const customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		const customEmojis = this.$store.state.instance.meta.emojis;
 		const emojiDefinitions: EmojiDef[] = [];
 
 		for (const x of customEmojis) {

src/client/components/drive.vue

@@ -23,13 +23,13 @@
 				<x-folder v-for="folder in folders" :key="folder.id" class="folder" :folder="folder"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
-				<mk-button v-if="moreFolders">{{ $t('@.load-more') }}</mk-button>
+				<mk-button v-if="moreFolders">{{ $t('loadMore') }}</mk-button>
 			</div>
 			<div class="files" ref="filesContainer" v-if="files.length > 0">
 				<x-file v-for="file in files" :key="file.id" class="file" :file="file" :select-mode="selectMode"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
-				<mk-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('@.load-more') }}</mk-button>
+				<mk-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('loadMore') }}</mk-button>
 			</div>
 			<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
 				<p v-if="draghover">{{ $t('empty-draghover') }}</p>

src/client/components/emoji-picker.vue

@@ -140,7 +140,7 @@ export default Vue.extend({
 	},
 
 	created() {
-		let local = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		let local = this.$store.state.instance.meta.emojis;
 		local = groupByX(local, (x: any) => x.category || '');
 		this.customEmojis = local;
 	},

src/client/components/emoji.vue

@@ -1,7 +1,7 @@
 <template>
 <img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt"/>
-<img v-else-if="char && !useOsDefaultEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/>
-<span v-else-if="char && useOsDefaultEmojis">{{ char }}</span>
+<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/>
+<span v-else-if="char && useOsNativeEmojis">{{ char }}</span>
 <span v-else>:{{ name }}:</span>
 </template>
 
@@ -53,15 +53,23 @@ export default Vue.extend({
 			return this.customEmoji ? `:${this.customEmoji.name}:` : this.char;
 		},
 
-		useOsDefaultEmojis(): boolean {
-			return this.$store.state.device.useOsDefaultEmojis && !this.isReaction;
+		useOsNativeEmojis(): boolean {
+			return this.$store.state.device.useOsNativeEmojis && !this.isReaction;
+		},
+
+		ce() {
+			let ce = [];
+			if (this.customEmojis) ce = ce.concat(this.customEmojis);
+			if (this.$store.state.instance.meta && this.$store.state.instance.meta.emojis) ce = ce.concat(this.$store.state.instance.meta.emojis);
+			return ce;
 		}
 	},
 
 	watch: {
-		customEmojis() {
+		ce: {
+			handler() {
 				if (this.name) {
-				const customEmoji = this.customEmojis.find(x => x.name == this.name);
+					const customEmoji = this.ce.find(x => x.name == this.name);
 					if (customEmoji) {
 						this.customEmoji = customEmoji;
 						this.url = this.$store.state.device.disableShowingAnimatedImages
@@ -70,23 +78,12 @@ export default Vue.extend({
 					}
 				}
 			},
+			immediate: true
+		},
 	},
 
 	created() {
-		if (this.name) {
-			const customEmoji = this.customEmojis.find(x => x.name == this.name);
-			if (customEmoji) {
-				this.customEmoji = customEmoji;
-				this.url = this.$store.state.device.disableShowingAnimatedImages
-					? getStaticImageUrl(customEmoji.url)
-					: customEmoji.url;
-			} else {
-				//const emoji = lib[this.name];
-				//if (emoji) {
-				//	this.char = emoji.char;
-				//}
-			}
-		} else {
+		if (!this.name) {
 			this.char = this.emoji;
 		}
 

src/client/components/error.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="mjndxjcg _panel">
-	<img src="https://xn--931a.moe/assets/error.jpg" alt=""/>
+	<img src="https://xn--931a.moe/assets/error.png" alt=""/>
 	<p><fa :icon="faExclamationTriangle"/> {{ $t('error') }}</p>
 	<mk-button @click="() => $emit('retry')" class="button">{{ $t('retry') }}</mk-button>
 </div>
@@ -45,6 +45,8 @@ export default Vue.extend({
 		height: 150px;
 		margin-bottom: 16px;
 		border-radius: 16px;
+		pointer-events: none;
+		user-select: none;
 	}
 }
 </style>

src/client/components/google.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="mk-google">
 	<input type="search" v-model="query" :placeholder="q">
-	<button @click="search"><fa icon="search"/> {{ $t('@.search') }}</button>
+	<button @click="search"><fa icon="search"/> {{ $t('search') }}</button>
 </div>
 </template>
 

src/client/components/link.vue

@@ -0,0 +1,88 @@
+<template>
+<component :is="self ? 'router-link' : 'a'" class="xlcxczvw _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
+	@mouseover="onMouseover"
+	@mouseleave="onMouseleave"
+	:title="url"
+>
+	<slot></slot>
+	<fa :icon="faExternalLinkSquareAlt" v-if="target === '_blank'" class="icon"/>
+</component>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
+import { url as local } from '../config';
+import XUrlPreview from './url-preview-popup.vue';
+
+export default Vue.extend({
+	props: {
+		url: {
+			type: String,
+			required: true,
+		},
+		rel: {
+			type: String,
+			required: false,
+		}
+	},
+	data() {
+		const self = this.url.startsWith(local);
+		return {
+			local,
+			self: self,
+			attr: self ? 'to' : 'href',
+			target: self ? null : '_blank',
+			showTimer: null,
+			hideTimer: null,
+			preview: null,
+			faExternalLinkSquareAlt
+		};
+	},
+	methods: {
+		showPreview() {
+			if (!document.body.contains(this.$el)) return;
+			if (this.preview) return;
+
+			this.preview = new XUrlPreview({
+				parent: this,
+				propsData: {
+					url: this.url,
+					source: this.$el
+				}
+			}).$mount();
+
+			document.body.appendChild(this.preview.$el);
+		},
+		closePreview() {
+			if (this.preview) {
+				this.preview.destroyDom();
+				this.preview = null;
+			}
+		},
+		onMouseover() {
+			clearTimeout(this.showTimer);
+			clearTimeout(this.hideTimer);
+			this.showTimer = setTimeout(this.showPreview, 500);
+		},
+		onMouseleave() {
+			clearTimeout(this.showTimer);
+			clearTimeout(this.hideTimer);
+			this.hideTimer = setTimeout(this.closePreview, 500);
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.xlcxczvw {
+	word-break: break-all;
+
+	> .icon {
+		padding-left: 2px;
+		font-size: .9em;
+		font-weight: 400;
+		font-style: normal;
+	}
+}
+</style>

src/client/components/loading.vue

@@ -1,30 +1,63 @@
 <template>
-<div class="yxspomdl">
-	<fa :icon="faSpinner" pulse fixed-width class="icon"/>
+<div class="yxspomdl" :class="{ inline }">
+	<div class="ring"></div>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
-	data() {
-		return {
-			faSpinner
-		};
-	},
+	props: {
+		inline: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	}
 });
 </script>
 
 <style lang="scss" scoped>
+@keyframes ring {
+	0% {
+		transform: rotate(0deg);
+	}
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
 .yxspomdl {
 	padding: 32px;
 	text-align: center;
 
-	> .icon {
-		font-size: 32px;
-		opacity: 0.5;
+	&.inline {
+		display: inline;
+		padding: 0;
+
+		> .ring:after {
+			width: 32px;
+			height: 32px;
+		}
+	}
+
+	> .ring {
+		display: inline-block;
+		opacity: 0.7;
+		vertical-align: middle;
+	}
+
+	> .ring:after {
+		content: " ";
+		display: block;
+		box-sizing: border-box;
+		width: 48px;
+		height: 48px;
+		border-radius: 50%;
+		border: solid 4px;
+		border-color: currentColor transparent transparent transparent;
+		animation: ring 0.5s linear infinite;
 	}
 }
 </style>

src/client/components/mfm.ts

@@ -2,6 +2,7 @@ import Vue, { VNode } from 'vue';
 import { MfmForest } from '../../mfm/types';
 import { parse, parsePlain } from '../../mfm/parse';
 import MkUrl from './url.vue';
+import MkLink from './link.vue';
 import MkMention from './mention.vue';
 import { concat } from '../../prelude/array';
 import MkFormula from './formula.vue';
@@ -158,14 +159,12 @@ export default Vue.component('misskey-flavored-markdown', {
 				}
 
 				case 'link': {
-					return [createElement('a', {
-						attrs: {
-							class: 'link _link',
-							href: token.node.props.url,
+					return [createElement(MkLink, {
+						key: Math.random(),
+						props: {
+							url: token.node.props.url,
 							rel: 'nofollow noopener',
-							target: '_blank',
-							title: token.node.props.url,
-						}
+						},
 					}, genEl(token.children))];
 				}
 
@@ -235,7 +234,6 @@ export default Vue.component('misskey-flavored-markdown', {
 				}
 
 				case 'emoji': {
-					const customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
 					return [createElement('mk-emoji', {
 						key: Math.random(),
 						attrs: {
@@ -243,7 +241,7 @@ export default Vue.component('misskey-flavored-markdown', {
 							name: token.node.props.name
 						},
 						props: {
-							customEmojis: this.customEmojis || customEmojis,
+							customEmojis: this.customEmojis,
 							normal: this.plain
 						}
 					})];

src/client/components/misskey-flavored-markdown.vue

@@ -1,5 +1,5 @@
 <template>
-<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ nowrap: $attrs['nowrap'] }" v-once/>
+<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ nowrap: $attrs['nowrap'] }"/>
 </template>
 
 <script lang="ts">

src/client/components/note.vue

@@ -19,7 +19,7 @@
 			</router-link>
 		</i18n>
 		<div class="info">
-			<button class="_button time" @click="showRenoteMenu"><mk-time :time="note.createdAt"/></button>
+			<button class="_button time" @click="showRenoteMenu()" ref="renoteTime"><mk-time :time="note.createdAt"/></button>
 			<span class="visibility" v-if="note.visibility != 'public'">
 				<fa v-if="note.visibility == 'home'" :icon="faHome"/>
 				<fa v-if="note.visibility == 'followers'" :icon="faUnlock"/>
@@ -558,7 +558,7 @@ export default Vue.extend({
 			}).then(this.focus);
 		},
 
-		showRenoteMenu(ev) {
+		showRenoteMenu(viaKeyboard = false) {
 			if (!this.$store.getters.isSignedIn || (this.$store.state.i.id !== this.note.userId)) return;
 			this.$root.menu({
 				items: [{
@@ -571,7 +571,7 @@ export default Vue.extend({
 						Vue.set(this.note, 'deletedAt', new Date());
 					}
 				}],
-				source: ev.currentTarget || ev.target,
+				source: this.$refs.renoteTime,
 				viaKeyboard: viaKeyboard
 			});
 		},

src/client/components/notes.vue

@@ -1,38 +1,38 @@
 <template>
 <div class="mk-notes" v-size="[{ max: 500 }]">
-	<div class="empty _panel" v-if="empty">
-		<img src="https://xn--931a.moe/assets/info.jpg" alt=""/>
+	<div class="empty" v-if="empty">
+		<img src="https://xn--931a.moe/assets/info.png" alt=""/>
 		<div>{{ $t('noNotes') }}</div>
 	</div>
 
 	<mk-error v-if="error" @retry="init()"/>
 
-	<x-list ref="notes" class="notes" :items="notes" v-slot="{ item: note, i }">
+	<x-list ref="notes" class="notes" :items="notes" v-slot="{ item: note }">
 		<x-note :note="note" :detail="detail" :key="note.id"/>
 	</x-list>
 
-	<footer v-if="more">
-		<button @click="fetchMore()" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" class="_buttonPrimary">
+	<footer class="more" v-if="more">
+		<mk-button class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore()" primary>
 			<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
-			<template v-if="moreFetching"><fa :icon="faSpinner" pulse fixed-width/></template>
-		</button>
+			<template v-if="moreFetching"><mk-loading inline/></template>
+		</mk-button>
 	</footer>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../i18n';
 import paging from '../scripts/paging';
 import XNote from './note.vue';
 import XList from './date-separated-list.vue';
+import MkButton from './ui/button.vue';
 
 export default Vue.extend({
 	i18n,
 
 	components: {
-		XNote, XList
+		XNote, XList, MkButton
 	},
 
 	mixins: [
@@ -63,12 +63,6 @@ export default Vue.extend({
 		}
 	},
 
-	data() {
-		return {
-			faSpinner
-		};
-	},
-
 	computed: {
 		notes(): any[] {
 			return this.extract ? this.extract(this.items) : this.items;
@@ -94,6 +88,8 @@ export default Vue.extend({
 			height: 128px;
 			margin-bottom: 16px;
 			border-radius: 16px;
+			pointer-events: none;
+			user-select: none;
 		}
 	}
 
@@ -111,23 +107,11 @@ export default Vue.extend({
 		}
 	}
 
-	> footer {
-		text-align: center;
-
-		&:empty {
-			display: none;
-		}
-
-		> button {
-			margin: 0;
-			padding: 16px;
+	> .more > .button {
+		margin-left: auto;
+		margin-right: auto;
+		height: 48px;
 		width: 100%;
-			border-radius: var(--radius);
-
-			&:disabled {
-				opacity: 0.7;
-			}
-		}
 	}
 }
 </style>

src/client/components/notification.vue

@@ -6,6 +6,7 @@
 			<fa :icon="faPlus" v-if="notification.type === 'follow'"/>
 			<fa :icon="faClock" v-if="notification.type === 'receiveFollowRequest'"/>
 			<fa :icon="faCheck" v-if="notification.type === 'followRequestAccepted'"/>
+			<fa :icon="faIdCardAlt" v-if="notification.type === 'groupInvited'"/>
 			<fa :icon="faRetweet" v-if="notification.type === 'renote'"/>
 			<fa :icon="faReply" v-if="notification.type === 'reply'"/>
 			<fa :icon="faAt" v-if="notification.type === 'mention'"/>
@@ -40,13 +41,14 @@
 		<span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="full"><mk-follow-button :user="notification.user" :full="true"/></div></span>
 		<span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span>
 		<span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span>
+		<span v-if="notification.type === 'groupInvited'" class="text" style="opacity: 0.6;">{{ $t('groupInvited') }}: <b>{{ notification.invitation.group.name }}</b><div v-if="full && !groupInviteDone"><button class="_textButton" @click="acceptGroupInvitation()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectGroupInvitation()">{{ $t('reject') }}</button></div></span>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import { faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck } from '@fortawesome/free-solid-svg-icons';
+import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck } from '@fortawesome/free-solid-svg-icons';
 import { faClock } from '@fortawesome/free-regular-svg-icons';
 import getNoteSummary from '../../misc/get-note-summary';
 import XReactionIcon from './reaction-icon.vue';
@@ -78,7 +80,8 @@ export default Vue.extend({
 		return {
 			getNoteSummary,
 			followRequestDone: false,
-			faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faClock, faCheck
+			groupInviteDone: false,
+			faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faClock, faCheck
 		};
 	},
 	methods: {
@@ -90,6 +93,18 @@ export default Vue.extend({
 			this.followRequestDone = true;
 			this.$root.api('following/requests/reject', { userId: this.notification.user.id });
 		},
+		acceptGroupInvitation() {
+			this.groupInviteDone = true;
+			this.$root.api('users/groups/invitations/accept', { invitationId: this.notification.invitation.id });
+			this.$root.dialog({
+				type: 'success',
+				iconOnly: true, autoClose: true
+			});
+		},
+		rejectGroupInvitation() {
+			this.groupInviteDone = true;
+			this.$root.api('users/groups/invitations/reject', { invitationId: this.notification.invitation.id });
+		},
 	}
 });
 </script>
@@ -149,7 +164,7 @@ export default Vue.extend({
 				height: 100%;
 			}
 
-			&.follow, &.followRequestAccepted, &.receiveFollowRequest {
+			&.follow, &.followRequestAccepted, &.receiveFollowRequest, &.groupInvited {
 				padding: 3px;
 				background: #36aed2;
 			}

src/client/components/post-form.vue

@@ -8,7 +8,7 @@
 	<header>
 		<button class="cancel _button" @click="cancel"><fa :icon="faTimes"/></button>
 		<div>
-			<span class="text-count" :class="{ over: trimmedLength(text) > 500 }">{{ 500 - trimmedLength(text) }}</span>
+			<span class="text-count" :class="{ over: trimmedLength(text) > max }">{{ max - trimmedLength(text) }}</span>
 			<button class="_button visibility" @click="setVisibility" ref="visibilityButton">
 				<span v-if="visibility === 'public'"><fa :icon="faGlobe"/></span>
 				<span v-if="visibility === 'home'"><fa :icon="faHome"/></span>
@@ -21,7 +21,7 @@
 	<div class="form">
 		<x-note-preview class="preview" v-if="reply" :note="reply"/>
 		<x-note-preview class="preview" v-if="renote" :note="renote"/>
-		<div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('@.post-form.quote-attached') }}<button @click="quoteId = null"><fa icon="times"/></button></div>
+		<div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('quoteAttached') }}<button @click="quoteId = null"><fa icon="times"/></button></div>
 		<div v-if="visibility === 'specified'" class="to-specified">
 			<span style="margin-right: 8px;">{{ $t('recipient') }}</span>
 			<div class="visibleUsers">
@@ -172,14 +172,18 @@ export default Vue.extend({
 		canPost(): boolean {
 			return !this.posting &&
 				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
-				(length(this.text.trim()) <= 500) &&
+				(length(this.text.trim()) <= this.max) &&
 				(!this.poll || this.pollChoices.length >= 2);
+		},
+
+		max(): number {
+			return this.$store.state.instance.meta ? this.$store.state.instance.meta.maxNoteTextLength : 1000;
 		}
 	},
 
 	watch: {
 		localOnly() {
-			this.$store.commit('device/setLocalOnly', this.localOnly);
+			this.$store.commit('deviceUser/setLocalOnly', this.localOnly);
 		}
 	},
 
@@ -215,9 +219,9 @@ export default Vue.extend({
 		}
 
 		// デフォルト公開範囲
-		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? this.$store.state.device.visibility : this.$store.state.settings.defaultNoteVisibility);
+		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? this.$store.state.deviceUser.visibility : this.$store.state.settings.defaultNoteVisibility);
 
-		this.localOnly = this.$store.state.settings.rememberNoteVisibility ? this.$store.state.device.localOnly : this.$store.state.settings.defaultNoteLocalOnly;
+		this.localOnly = this.$store.state.settings.rememberNoteVisibility ? this.$store.state.deviceUser.localOnly : this.$store.state.settings.defaultNoteLocalOnly;
 
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
 		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
@@ -441,7 +445,7 @@ export default Vue.extend({
 
 				this.$root.dialog({
 					type: 'info',
-					text: this.$t('@.post-form.quote-question'),
+					text: this.$t('quoteQuestion'),
 					showCancelButton: true
 				}).then(({ canceled }) => {
 					if (canceled) {
@@ -606,6 +610,7 @@ export default Vue.extend({
 			right: 0;
 
 			> .text-count {
+				opacity: 0.7;
 				line-height: 66px;
 
 				@media (max-width: 500px) {
@@ -713,7 +718,7 @@ export default Vue.extend({
 			border-radius: 0;
 			background: transparent;
 			color: var(--fg);
-			font-family: initial;
+			font-family: inherit;
 
 			@media (max-width: 500px) {
 				padding: 0 16px;

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" :custom-emojis="customEmojis" :normal="true" :no-style="noStyle"/>
+<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"/>
 </template>
 
 <script lang="ts">
@@ -18,15 +18,5 @@ export default Vue.extend({
 			default: false
 		},
 	},
-	data() {
-		return {
-			customEmojis: []
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			if (meta && meta.emojis) this.customEmojis = meta.emojis;
-		});
-	},
 });
 </script>

src/client/components/reaction-picker.vue

@@ -13,7 +13,7 @@
 			mode="out-in"
 			appear
 		>
-			<button class="_button" v-for="(reaction, i) in rs" :key="reaction" @click="react(reaction)" :tabindex="i + 1" :title="/^[a-z]+$/.test(reaction) ? $t('@.reactions.' + reaction) : reaction"><x-reaction-icon :reaction="reaction"/></button>
+			<button class="_button" v-for="(reaction, i) in rs" :key="reaction" @click="react(reaction)" :tabindex="i + 1" :title="reaction"><x-reaction-icon :reaction="reaction"/></button>
 		</transition-group>
 		<input class="text" v-model="text" :placeholder="$t('enterEmoji')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
 	</div>

src/client/components/sequential-entrance.vue

@@ -40,23 +40,31 @@ export default Vue.extend({
 	i: 0,
 	methods: {
 		beforeEnter(el) {
+			if (document.hidden) return;
+
 			el.style.opacity = 0;
 			el.style.transform = this.direction === 'down' ? 'translateY(-64px)' : 'translateY(64px)';
-			let index = this.$options.i;
-			const delay = this.delay * index;
+			const delay = this.delay * this.$options.i;
 			el.style.transition = [getComputedStyle(el).transition, `transform 0.7s cubic-bezier(0.23, 1, 0.32, 1) ${delay}ms`, `opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1) ${delay}ms`].filter(x => x != '').join(',');
 			this.$options.i++;
-		},
-		enter(el, done) {
+
 			setTimeout(() => {
+				el.style.transition = null;
+				el.style.transform = null;
+				el.style.opacity = null;
+				this.$options.i--;
+			}, delay + 710);
+		},
+		enter(el) {
+			if (document.hidden) {
+				el.style.opacity = 1;
+				el.style.transform = 'translateY(0px)';
+			} else {
+				setTimeout(() => { // 必要
 					el.style.opacity = 1;
 					el.style.transform = 'translateY(0px)';
-				el.addEventListener('transitionend', () => {
-					el.style.transition = '';
-					this.$options.i--;
-					done();
-				}, { once: true });
 				});
+			}
 		},
 		leave(el) {
 			el.style.opacity = 0;

src/client/components/signin.vue

@@ -12,15 +12,15 @@
 			<template #prefix><fa :icon="faLock"/></template>
 		</mk-input>
 		<mk-button type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</mk-button>
-		<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="['fab', 'twitter']"/> {{ $t('signin-with-twitter') }}</a></p>
-		<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="['fab', 'github']"/> {{ $t('signin-with-github') }}</a></p>
-		<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="['fab', 'discord']"/> {{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
+		<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="faTwitter"/> {{ $t('signinWith', { x: 'Twitter' }) }}</a></p>
+		<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="faGithub"/> {{ $t('signinWith', { x: 'GitHub' }) }}</a></p>
+		<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="faDiscord"/> {{ $t('signinWith', { x: 'Discord' }) }}</a></p>
 	</div>
 	<div class="2fa-signin" v-if="totpLogin" :class="{ securityKeys: user && user.securityKeys }">
 		<div v-if="user && user.securityKeys" class="twofa-group tap-group">
-			<p>{{ $t('tap-key') }}</p>
+			<p>{{ $t('tapSecurityKey') }}</p>
 			<mk-button @click="queryKey" v-if="!queryingKey">
-				{{ $t('@.error.retry') }}
+				{{ $t('retry') }}
 			</mk-button>
 		</div>
 		<div class="or-hr" v-if="user && user.securityKeys">
@@ -46,6 +46,7 @@
 import Vue from 'vue';
 import { toUnicode } from 'punycode';
 import { faLock, faGavel } from '@fortawesome/free-solid-svg-icons';
+import { faTwitter, faDiscord, faGithub } from '@fortawesome/free-brands-svg-icons';
 import MkButton from './ui/button.vue';
 import MkInput from './ui/input.vue';
 import i18n from '../i18n';
@@ -82,20 +83,21 @@ export default Vue.extend({
 			token: '',
 			apiUrl,
 			host: toUnicode(host),
-			meta: null,
 			totpLogin: false,
 			credential: null,
 			challengeData: null,
 			queryingKey: false,
-			faLock, faGavel
+			faLock, faGavel, faTwitter, faDiscord, faGithub
 		};
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
 
+	created() {
 		if (this.autoSet) {
 			this.$once('login', res => {
 				localStorage.setItem('i', res.i);

src/client/components/signup.vue

@@ -2,9 +2,8 @@
 <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
 	<template v-if="meta">
 		<mk-input v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
-			<span>{{ $t('invitation-code') }}</span>
-			<template #prefix><fa icon="id-card-alt"/></template>
-			<template #desc v-html="this.$t('invitation-info').replace('{}', 'mailto:' + meta.maintainerEmail)"></template>
+			<span>{{ $t('invitationCode') }}</span>
+			<template #prefix><fa :icon="faKey"/></template>
 		</mk-input>
 		<mk-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername">
 			<span>{{ $t('username') }}</span>
@@ -15,26 +14,26 @@
 				<span v-if="usernameState == 'ok'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('available') }}</span>
 				<span v-if="usernameState == 'unavailable'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('unavailable') }}</span>
 				<span v-if="usernameState == 'error'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('error') }}</span>
-				<span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('invalid-format') }}</span>
-				<span v-if="usernameState == 'min-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('too-short') }}</span>
-				<span v-if="usernameState == 'max-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('too-long') }}</span>
+				<span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('usernameInvalidFormat') }}</span>
+				<span v-if="usernameState == 'min-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooShort') }}</span>
+				<span v-if="usernameState == 'max-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooLong') }}</span>
 			</template>
 		</mk-input>
 		<mk-input v-model="password" type="password" :autocomplete="Math.random()" required @input="onChangePassword">
 			<span>{{ $t('password') }}</span>
 			<template #prefix><fa :icon="faLock"/></template>
 			<template #desc>
-				<p v-if="passwordStrength == 'low'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('weak-password') }}</p>
-				<p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('normal-password') }}</p>
-				<p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('strong-password') }}</p>
+				<p v-if="passwordStrength == 'low'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('weakPassword') }}</p>
+				<p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('normalPassword') }}</p>
+				<p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('strongPassword') }}</p>
 			</template>
 		</mk-input>
 		<mk-input v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @input="onChangePasswordRetype">
 			<span>{{ $t('password') }} ({{ $t('retype') }})</span>
 			<template #prefix><fa :icon="faLock"/></template>
 			<template #desc>
-				<p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('password-matched') }}</p>
-				<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('password-not-matched') }}</p>
+				<p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('passwordMatched') }}</p>
+				<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('passwordNotMatched') }}</p>
 			</template>
 		</mk-input>
 		<mk-switch v-model="ToSAgreement" v-if="meta.tosUrl">
@@ -50,7 +49,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faLock, faExclamationTriangle, faSpinner, faCheck } from '@fortawesome/free-solid-svg-icons';
+import { faLock, faExclamationTriangle, faSpinner, faCheck, faKey } from '@fortawesome/free-solid-svg-icons';
 const getPasswordStrength = require('syuilo-password-strength');
 import { toUnicode } from 'punycode';
 import i18n from '../i18n';
@@ -79,14 +78,17 @@ export default Vue.extend({
 			usernameState: null,
 			passwordStrength: '',
 			passwordRetypeState: null,
-			meta: {},
 			submitting: false,
 			ToSAgreement: false,
-			faLock, faExclamationTriangle, faSpinner, faCheck
+			faLock, faExclamationTriangle, faSpinner, faCheck, faKey
 		}
 	},
 
 	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+		
 		shouldShowProfileUrl(): boolean {
 			return (this.username != '' &&
 				this.usernameState != 'invalid-format' &&
@@ -95,12 +97,6 @@ export default Vue.extend({
 		}
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	},
-
 	mounted() {
 		const head = document.getElementsByTagName('head')[0];
 		const script = document.createElement('script');
@@ -178,7 +174,7 @@ export default Vue.extend({
 
 				this.$root.dialog({
 					type: 'error',
-					text: this.$t('some-error')
+					text: this.$t('error')
 				});
 
 				if (this.meta.enableRecaptcha) {

src/client/components/time.vue

@@ -48,7 +48,7 @@ export default Vue.extend({
 				ago >= 10       ? this.$t('_ago.secondsAgo', { n: (~~(ago % 60)).toString() }) :
 				ago >= -1       ? this.$t('_ago.justNow') :
 				ago <  -1       ? this.$t('_ago.future') :
-				this.$t('@.time.unknown'));
+				this.$t('_ago.unknown'));
 		}
 	},
 	created() {

src/client/components/timeline.vue

@@ -27,6 +27,7 @@ export default Vue.extend({
 	data() {
 		return {
 			connection: null,
+			connection2: null,
 			pagination: null,
 			baseQuery: {
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
@@ -40,6 +41,7 @@ export default Vue.extend({
 	created() {
 		this.$once('hook:beforeDestroy', () => {
 			this.connection.dispose();
+			if (this.connection2) this.connection2.dispose();
 		});
 
 		const prepend = note => {
@@ -54,6 +56,12 @@ export default Vue.extend({
 			(this.$refs.tl as any).reload();
 		};
 
+		const onChangeFollowing = () => {
+			if (!this.$refs.tl.backed) {
+				this.$refs.tl.reload();
+			}
+		};
+
 		let endpoint;
 
 		if (this.src == 'antenna') {
@@ -67,13 +75,12 @@ export default Vue.extend({
 			this.connection.on('note', prepend);
 		} else if (this.src == 'home') {
 			endpoint = 'notes/timeline';
-			const onChangeFollowing = () => {
-				this.fetch();
-			};
 			this.connection = this.$root.stream.useSharedConnection('homeTimeline');
 			this.connection.on('note', prepend);
-			this.connection.on('follow', onChangeFollowing);
-			this.connection.on('unfollow', onChangeFollowing);
+
+			this.connection2 = this.$root.stream.useSharedConnection('main');
+			this.connection2.on('follow', onChangeFollowing);
+			this.connection2.on('unfollow', onChangeFollowing);
 		} else if (this.src == 'local') {
 			endpoint = 'notes/local-timeline';
 			this.connection = this.$root.stream.useSharedConnection('localTimeline');

src/client/components/ui/button.vue

@@ -124,6 +124,7 @@ export default Vue.extend({
 	&.primary {
 		color: #fff;
 		background: var(--accent);
+		box-shadow: 0 6px 16px var(--accentShadow);
 
 		&:not(:disabled):hover {
 			background: var(--jkhztclx);

src/client/components/ui/input.vue

@@ -327,14 +327,16 @@ export default Vue.extend({
 		}
 
 		> input {
+			$height: 32px;
 			display: block;
+			height: $height;
 			width: 100%;
 			margin: 0;
 			padding: 0;
 			font: inherit;
 			font-weight: normal;
 			font-size: 16px;
-			line-height: 32px;
+			line-height: $height;
 			color: var(--inputText);
 			background: transparent;
 			border: none;

src/client/components/ui/pagination.vue

@@ -5,9 +5,9 @@
 		<slot name="empty"></slot>
 	</div>
 	<div class="more" v-if="more" key="_more_">
-		<mk-button :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore()">
+		<mk-button class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore()" primary>
 			<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
-			<template v-if="moreFetching"><fa :icon="faSpinner" pulse fixed-width/></template>
+			<template v-if="moreFetching"><mk-loading inline/></template>
 		</mk-button>
 	</div>
 </sequential-entrance>
@@ -15,7 +15,6 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import MkButton from './button.vue';
 import paging from '../../scripts/paging';
 
@@ -37,12 +36,6 @@ export default Vue.extend({
 			default: true
 		}
 	},
-
-	data() {
-		return {
-			faSpinner
-		};
-	},
 });
 </script>
 
@@ -55,5 +48,12 @@ export default Vue.extend({
 			margin-bottom: 8px;
 		}
 	}
+
+	> .more > .button {
+		margin-left: auto;
+		margin-right: auto;
+		height: 48px;
+		min-width: 150px;
+	}
 }
 </style>

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

@@ -0,0 +1,56 @@
+<template>
+<div class="fgmtyycl _panel" :style="{ top: top + 'px', left: left + 'px' }">
+	<x-url-preview :url="url"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../i18n';
+import XUrlPreview from './url-preview.vue';
+
+export default Vue.extend({
+	i18n,
+
+	components: {
+		XUrlPreview
+	},
+
+	props: {
+		url: {
+			type: String,
+			required: true
+		},
+		source: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			u: null,
+			top: 0,
+			left: 0,
+		};
+	},
+
+	mounted() {
+		const rect = this.source.getBoundingClientRect();
+		const x = ((rect.left + (this.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
+		const y = rect.top + this.source.offsetHeight + window.pageYOffset;
+
+		this.top = y;
+		this.left = x;
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.fgmtyycl {
+	position: absolute;
+	z-index: 11000;
+	width: 500px;
+	overflow: hidden;
+	pointer-events: none;
+}
+</style>

src/client/components/url-preview.vue

@@ -10,7 +10,7 @@
 </div>
 <div v-else class="mk-url-preview" v-size="[{ max: 400 }, { max: 350 }]">
 	<transition name="zoom" mode="out-in">
-		<component :is="hasRoute ? 'router-link' : 'a'" :class="{ compact }" :[attr]="hasRoute ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url" v-if="!fetching">
+		<component :is="self ? 'router-link' : 'a'" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url" v-if="!fetching">
 			<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`">
 				<button class="_button" v-if="!playerEnabled && player.url" @click.prevent="playerEnabled = true" :title="$t('enable-player')"><fa :icon="faPlayCircle"/></button>
 			</div>
@@ -58,12 +58,7 @@ export default Vue.extend({
 	},
 
 	data() {
-		const isSelf = this.url.startsWith(local);
-		const hasRoute =
-			(this.url.substr(local.length) === '/') ||
-			this.url.substr(local.length).startsWith('/@') ||
-			this.url.substr(local.length).startsWith('/notes/') ||
-			this.url.substr(local.length).startsWith('/tags/');
+		const self = this.url.startsWith(local);
 		return {
 			local,
 			fetching: true,
@@ -79,10 +74,9 @@ export default Vue.extend({
 			},
 			tweetUrl: null,
 			playerEnabled: false,
-			self: isSelf,
-			hasRoute: hasRoute,
-			attr: hasRoute ? 'to' : 'href',
-			target: hasRoute ? null : '_blank',
+			self: self,
+			attr: self ? 'to' : 'href',
+			target: self ? null : '_blank',
 			faPlayCircle
 		};
 	},

src/client/components/url.vue

@@ -1,5 +1,8 @@
 <template>
-<component :is="hasRoute ? 'router-link' : 'a'" class="ieqqeuvs _link" :[attr]="hasRoute ? url.substr(local.length) : url" :rel="rel" :target="target">
+<component :is="self ? 'router-link' : 'a'" class="ieqqeuvs _link" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target"
+	@mouseover="onMouseover"
+	@mouseleave="onMouseleave"
+>
 	<template v-if="!self">
 		<span class="schema">{{ schema }}//</span>
 		<span class="hostname">{{ hostname }}</span>
@@ -20,28 +23,35 @@ import Vue from 'vue';
 import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { toUnicode as decodePunycode } from 'punycode';
 import { url as local } from '../config';
+import XUrlPreview from './url-preview-popup.vue';
 
 export default Vue.extend({
-	props: ['url', 'rel'],
+	props: {
+		url: {
+			type: String,
+			required: true,
+		},
+		rel: {
+			type: String,
+			required: false,
+		}
+	},
 	data() {
-		const isSelf = this.url.startsWith(local);
-		const hasRoute = isSelf && (
-			(this.url.substr(local.length) === '/') ||
-			this.url.substr(local.length).startsWith('/@') ||
-			this.url.substr(local.length).startsWith('/notes/') ||
-			this.url.substr(local.length).startsWith('/tags/'));
+		const self = this.url.startsWith(local);
 		return {
 			local,
-			schema: null,
-			hostname: null,
-			port: null,
-			pathname: null,
-			query: null,
-			hash: null,
-			self: isSelf,
-			hasRoute: hasRoute,
-			attr: hasRoute ? 'to' : 'href',
-			target: hasRoute ? null : '_blank',
+			schema: null as string | null,
+			hostname: null as string | null,
+			port: null as string | null,
+			pathname: null as string | null,
+			query: null as string | null,
+			hash: null as string | null,
+			self: self,
+			attr: self ? 'to' : 'href',
+			target: self ? null : '_blank',
+			showTimer: null,
+			hideTimer: null,
+			preview: null,
 			faExternalLinkSquareAlt
 		};
 	},
@@ -53,6 +63,38 @@ export default Vue.extend({
 		this.pathname = decodeURIComponent(url.pathname);
 		this.query = decodeURIComponent(url.search);
 		this.hash = decodeURIComponent(url.hash);
+	},
+	methods: {
+		showPreview() {
+			if (!document.body.contains(this.$el)) return;
+			if (this.preview) return;
+
+			this.preview = new XUrlPreview({
+				parent: this,
+				propsData: {
+					url: this.url,
+					source: this.$el
+				}
+			}).$mount();
+
+			document.body.appendChild(this.preview.$el);
+		},
+		closePreview() {
+			if (this.preview) {
+				this.preview.destroyDom();
+				this.preview = null;
+			}
+		},
+		onMouseover() {
+			clearTimeout(this.showTimer);
+			clearTimeout(this.hideTimer);
+			this.showTimer = setTimeout(this.showPreview, 500);
+		},
+		onMouseleave() {
+			clearTimeout(this.showTimer);
+			clearTimeout(this.hideTimer);
+			this.hideTimer = setTimeout(this.closePreview, 500);
+		}
 	}
 });
 </script>

src/client/components/user-list.vue

@@ -23,7 +23,7 @@
 			<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 		</div>
 		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
-			<template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }}
+			<template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('loading') : $t('loadMore') }}
 		</button>
 	</div>
 </mk-container>

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 } from '@fortawesome/free-solid-svg-icons';
+import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers } from '@fortawesome/free-solid-svg-icons';
 import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import i18n from '../i18n';
 import XMenu from './menu.vue';
@@ -43,7 +43,11 @@ export default Vue.extend({
 			icon: faListUl,
 			text: this.$t('addToList'),
 			action: this.pushList
-		}] as any;
+		}, this.$store.state.i.id != this.user.id ? {
+			icon: faUsers,
+			text: this.$t('inviteToGroup'),
+			action: this.inviteGroup
+		} : undefined] as any;
 
 		if (this.$store.getters.isSignedIn && this.$store.state.i.id != this.user.id) {
 			menu = menu.concat([null, {
@@ -118,6 +122,42 @@ export default Vue.extend({
 			});
 		},
 
+		async inviteGroup() {
+			const groups = await this.$root.api('users/groups/owned');
+			if (groups.length === 0) {
+				this.$root.dialog({
+					type: 'error',
+					text: this.$t('youHaveNoGroups')
+				});
+				return;
+			}
+			const { canceled, result: groupId } = await this.$root.dialog({
+				type: null,
+				title: this.$t('group'),
+				select: {
+					items: groups.map(group => ({
+						value: group.id, text: group.name
+					}))
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+			this.$root.api('users/groups/invite', {
+				groupId: groupId,
+				userId: this.user.id
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
+			}).catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			});
+		},
+
 		async toggleMute() {
 			this.$root.api(this.user.isMuted ? 'mute/delete' : 'mute/create', {
 				userId: this.user.id

src/client/components/visibility-chooser.vue

@@ -56,14 +56,14 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			v: this.$store.state.settings.rememberNoteVisibility ? this.$store.state.device.visibility : (this.currentVisibility || this.$store.state.settings.defaultNoteVisibility),
+			v: this.$store.state.settings.rememberNoteVisibility ? this.$store.state.deviceUser.visibility : (this.currentVisibility || this.$store.state.settings.defaultNoteVisibility),
 			faGlobe, faUnlock, faEnvelope, faHome
 		}
 	},
 	methods: {
 		choose(visibility) {
 			if (this.$store.state.settings.rememberNoteVisibility) {
-				this.$store.commit('device/setVisibility', visibility);
+				this.$store.commit('deviceUser/setVisibility', visibility);
 			}
 			this.$emit('chosen', visibility);
 			this.destroyDom();

src/client/config.ts

@@ -3,7 +3,7 @@ declare const _VERSION_: string;
 declare const _ENV_: string;
 
 const address = new URL(location.href);
-const siteName = document.querySelector('meta[property="og:site_name"]') as HTMLMetaElement;
+const siteName = (document.querySelector('meta[property="og:site_name"]') as HTMLMetaElement)?.content;
 
 export const host = address.host;
 export const hostname = address.hostname;
@@ -15,4 +15,4 @@ export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem('locale'));
 export const version = _VERSION_;
 export const env = _ENV_;
-export const instanceName = siteName && siteName.content ? siteName.content : 'Misskey';
+export const instanceName = siteName === 'Misskey' ? null : siteName;

src/client/directives/size.ts

@@ -1,3 +1,5 @@
+import { ResizeObserver } from '@juggle/resize-observer';
+
 export default {
 	inserted(el, binding, vn) {
 		const query = binding.value;
@@ -52,13 +54,16 @@ export default {
 
 		calc();
 
-		el._sizeResizeCb_ = calc;
+		const ro = new ResizeObserver((entries, observer) => {
+			calc();
+		});
 		
-		window.addEventListener('resize', calc);
-		vn.context.$on('hook:activated', calc);
+		ro.observe(el);
+
+		el._ro_ = ro;
 	},
 
 	unbind(el, binding, vn) {
-		window.removeEventListener('resize', el._sizeResizeCb_);
+		el._ro_.unobserve(el);
 	}
 };

src/client/init.ts

@@ -61,20 +61,22 @@ if (localStorage.getItem('theme') == null) {
 }
 
 //#region Detect the user language
-let lang = null;
+let lang = localStorage.getItem('lang');
 
-if (langs.map(x => x[0]).includes(navigator.language)) {
+if (lang == null) {
+	if (langs.map(x => x[0]).includes(navigator.language)) {
 		lang = navigator.language;
-} else {
+	} else {
 		lang = langs.map(x => x[0]).find(x => x.split('-')[0] == navigator.language);
 
 		if (lang == null) {
 			// Fallback
 			lang = 'en-US';
 		}
-}
+	}
 
-localStorage.setItem('lang', lang);
+	localStorage.setItem('lang', lang);
+}
 //#endregion
 
 // Detect the user agent
@@ -147,7 +149,7 @@ os.init(async () => {
 		store: os.store,
 		metaInfo: {
 			title: null,
-			titleTemplate: title => title ? `${title} | ${instanceName}` : instanceName
+			titleTemplate: title => title ? `${title} | ${(instanceName || 'Misskey')}` : (instanceName || 'Misskey')
 		},
 		data() {
 			return {
@@ -157,8 +159,6 @@ os.init(async () => {
 		},
 		methods: {
 			api: os.api,
-			getMeta: os.getMeta,
-			getMetaSync: os.getMetaSync,
 			signout: os.signout,
 			new(vm, props) {
 				const x = new vm({

src/client/mios.ts

@@ -17,16 +17,6 @@ let pending = 0;
  * Misskey Operating System
  */
 export default class MiOS extends EventEmitter {
-	/**
-	 * Misskeyの /meta で取得できるメタ情報
-	 */
-	private meta: {
-		data: { [x: string]: any };
-		chachedAt: Date;
-	};
-
-	private isMetaFetching = false;
-
 	public app: Vue;
 
 	public store: ReturnType<typeof initStore>;
@@ -52,7 +42,16 @@ export default class MiOS extends EventEmitter {
 	 * @param callback A function that call when initialized
 	 */
 	@autobind
-	public async init(callback) {
+	public async init(_callback) {
+		const callback = () => {
+			_callback();
+
+			this.store.dispatch('instance/fetch').then(() => {
+				// Init service worker
+				if (this.store.state.instance.meta.swPublickey) this.registerSw(this.store.state.instance.meta.swPublickey);
+			});
+		};
+
 		this.store = initStore(this);
 
 		// ユーザーをフェッチしてコールバックする
@@ -88,7 +87,7 @@ export default class MiOS extends EventEmitter {
 			// When failure
 			.catch(() => {
 				// Render the error screen
-				document.body.innerHTML = '<div id="err">Error</div>';
+				document.body.innerHTML = '<div id="err">Oops!</div>';
 
 				Progress.done();
 			});
@@ -106,11 +105,6 @@ export default class MiOS extends EventEmitter {
 
 			// Finish init
 			callback();
-
-			// Init service worker
-			this.getMeta().then(data => {
-				if (data.swPublickey) this.registerSw(data.swPublickey);
-			});
 		};
 
 		// キャッシュがあったとき
@@ -350,49 +344,6 @@ export default class MiOS extends EventEmitter {
 
 		return promise;
 	}
-
-	/**
-	 * Misskeyのメタ情報を取得します
-	 */
-	@autobind
-	public getMetaSync() {
-		return this.meta ? this.meta.data : null;
-	}
-
-	/**
-	 * Misskeyのメタ情報を取得します
-	 * @param force キャッシュを無視するか否か
-	 */
-	@autobind
-	public getMeta(force = false) {
-		return new Promise<{ [x: string]: any }>(async (res, rej) => {
-			if (this.isMetaFetching) {
-				this.once('_meta_fetched_', () => {
-					res(this.meta.data);
-				});
-				return;
-			}
-
-			const expire = 1000 * 60; // 1min
-
-			// forceが有効, meta情報を保持していない or 期限切れ
-			if (force || this.meta == null || Date.now() - this.meta.chachedAt.getTime() > expire) {
-				this.isMetaFetching = true;
-				const meta = await this.api('meta', {
-					detail: false
-				});
-				this.meta = {
-					data: meta,
-					chachedAt: new Date()
-				};
-				this.isMetaFetching = false;
-				this.emit('_meta_fetched_');
-				res(meta);
-			} else {
-				res(this.meta.data);
-			}
-		});
-	}
 }
 
 /**

src/client/pages/about-misskey.vue

@@ -0,0 +1,79 @@
+<template>
+<div class="znqjceqz">
+	<portal to="title">🍀 {{ $t('aboutMisskey') }}</portal>
+
+	<section class="_card">
+		<div class="_title">🍀 {{ $t('aboutMisskey') }}</div>
+		<div class="_content">
+			<div style="margin-bottom: 1em;">{{ $t('aboutMisskeyText') }}</div>
+			<div>🛠️ {{ $t('misskeyMembers') }}</div>
+			<ul class="members">
+				<li><mk-link url="https://github.com/syuilo" class="at">@syuilo</mk-link></li>
+				<li><mk-link url="https://github.com/AyaMorisawa" class="at">@AyaMorisawa</mk-link></li>
+				<li><mk-link url="https://github.com/mei23" class="at">@mei23</mk-link></li>
+				<li><mk-link url="https://github.com/acid-chicken" class="at">@acid-chicken</mk-link></li>
+				<li><mk-link url="https://github.com/tamaina" class="at">@tamaina</mk-link></li>
+				<li><mk-link url="https://github.com/rinsuki" class="at">@rinsuki</mk-link></li>
+			</ul>
+			<div style="margin-top: 1em;">📦 {{ $t('misskeySource') }}</div>
+			<mk-url url="https://github.com/syuilo/misskey"/>
+			<div style="margin-top: 1em;">🌏 {{ $t('misskeyTranslation') }}</div>
+			<mk-url url="https://crowdin.com/project/misskey"/>
+			<div style="margin-top: 1em;">💴 {{ $t('misskeyDonate') }}</div>
+			<mk-url url="https://www.patreon.com/syuilo"/>
+		</div>
+		<div class="_content">
+			<span><mfm text="<motion>❤</motion>"/> {{ $t('patrons') }}</span>
+			<ul>
+				<li>Gargron</li>
+				<li>Satsuki Yanagi</li>
+				<li>noellabo</li>
+				<li>naga_rus</li>
+				<li>Melilot</li>
+				<li>AureoleArk</li>
+				<li>Peter G.</li>
+				<li>motcha</li>
+				<li>Atsuko Tominaga</li>
+				<li>dansup</li>
+				<li>Nokotaro Takeda</li>
+				<li>YUKIMOCHI</li>
+				<li>nanami kan</li>
+				<li>Hekovic</li>
+				<li>wara</li>
+				<li>Takashi Shibuya</li>
+				<li>Noizeman</li>
+			</ul>
+			<span>{{ $t('morePatrons') }}</span>
+		</div>
+	</section>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faInfoCircle } from '@fortawesome/free-solid-svg-icons';
+import { version } from '../config';
+import i18n from '../i18n';
+import MkLink from '../components/link.vue';
+
+export default Vue.extend({
+	i18n,
+
+	components: {
+		MkLink
+	},
+
+	metaInfo() {
+		return {
+			title: this.$t('aboutMisskey') as string
+		};
+	},
+
+	data() {
+		return {
+			version,
+			faInfoCircle
+		}
+	},
+});
+</script>

src/client/pages/about.vue

@@ -6,7 +6,7 @@
 	<section class="_card info" v-if="meta">
 		<div class="_title"><fa :icon="faInfoCircle"/> {{ $t('instanceInfo') }}</div>
 		<div class="_content" v-if="meta.description">
-			<div>{{ meta.description }}</div>
+			<div v-html="meta.description"></div>
 		</div>
 		<div class="_content table">
 			<div><b>{{ $t('administrator') }}</b><span>{{ meta.maintainerName }}</span></div>
@@ -20,49 +20,6 @@
 			<div><b>Misskey</b><span>v{{ version }}</span></div>
 		</div>
 	</section>
-
-	<section class="_card aboutMisskey">
-		<div class="_title"><fa :icon="faInfoCircle"/> {{ $t('aboutMisskey') }}</div>
-		<div class="_content">
-			<div style="margin-bottom: 1em;">{{ $t('aboutMisskeyText') }}</div>
-			<div>{{ $t('misskeyMembers') }}</div>
-			<span class="members">
-				<a href="https://github.com/syuilo" target="_blank" class="_link">@syuilo</a>
-				<a href="https://github.com/AyaMorisawa" target="_blank" class="_link">@AyaMorisawa</a>
-				<a href="https://github.com/mei23" target="_blank" class="_link">@mei23</a>
-				<a href="https://github.com/acid-chicken" target="_blank" class="_link">@acid-chicken</a>
-				<a href="https://github.com/tamaina" target="_blank" class="_link">@tamaina</a>
-				<a href="https://github.com/rinsuki" target="_blank" class="_link">@rinsuki</a>
-			</span>
-			<div style="margin-top: 1em;">{{ $t('misskeySource') }}</div>
-			<mk-url url="https://github.com/syuilo/misskey"/>
-			<div style="margin-top: 1em;">{{ $t('misskeyDonate') }}</div>
-			<mk-url url="https://www.patreon.com/syuilo"/>
-		</div>
-		<div class="_content">
-			<span><mfm text="<motion>❤</motion>"/> {{ $t('patrons') }}</span>
-			<ul>
-				<li>Gargron</li>
-				<li>Satsuki Yanagi</li>
-				<li>noellabo</li>
-				<li>naga_rus</li>
-				<li>Melilot</li>
-				<li>AureoleArk</li>
-				<li>Peter G.</li>
-				<li>motcha</li>
-				<li>Atsuko Tominaga</li>
-				<li>dansup</li>
-				<li>Nokotaro Takeda</li>
-				<li>YUKIMOCHI</li>
-				<li>nanami kan</li>
-				<li>Hekovic</li>
-				<li>wara</li>
-				<li>Takashi Shibuya</li>
-				<li>Noizeman</li>
-			</ul>
-			<span>{{ $t('morePatrons') }}</span>
-		</div>
-	</section>
 </div>
 </template>
 
@@ -84,18 +41,19 @@ export default Vue.extend({
 	data() {
 		return {
 			version,
-			meta: null,
 			stats: null,
 			serverInfo: null,
 			faInfoCircle
 		}
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
 
+	created() {
 		this.$root.api('stats').then(res => {
 			this.stats = res;
 		});
@@ -116,15 +74,5 @@ export default Vue.extend({
 			}
 		}
 	}
-
-	> .aboutMisskey {
-		> ._content {
-			> .members {
-				> a {
-					margin-right: 0.5em;
-				}
-			}
-		}
-	}
 }
 </style>

src/client/pages/explore.vue

@@ -115,13 +115,15 @@ export default Vue.extend({
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
-			meta: null,
 			num: Vue.filter('number'),
 			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag, faRocket
 		};
 	},
 
 	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
 		tagUsers(): any {
 			return {
 				endpoint: 'hashtags/users',
@@ -159,9 +161,6 @@ export default Vue.extend({
 		this.$root.api('stats').then(stats => {
 			this.stats = stats;
 		});
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
 	},
 });
 </script>

src/client/pages/index.home.tutorial.vue

@@ -0,0 +1,127 @@
+<template>
+<div class="_card tbkwesmv">
+	<div class="_title"><fa :icon="faInfoCircle"/> {{ $t('_tutorial.title') }}</div>
+	<div class="_content" v-if="tutorial === 0">
+		<div>{{ $t('_tutorial.step1_1') }}</div>
+		<div>{{ $t('_tutorial.step1_2') }}</div>
+		<div>{{ $t('_tutorial.step1_3') }}</div>
+	</div>
+	<div class="_content" v-else-if="tutorial === 1">
+		<div>{{ $t('_tutorial.step2_1') }}</div>
+		<div>{{ $t('_tutorial.step2_2') }}</div>
+		<router-link class="_link" to="/my/settings">{{ $t('editProfile') }}</router-link>
+	</div>
+	<div class="_content" v-else-if="tutorial === 2">
+		<div>{{ $t('_tutorial.step3_1') }}</div>
+		<div>{{ $t('_tutorial.step3_2') }}</div>
+		<div>{{ $t('_tutorial.step3_3') }}</div>
+		<small>{{ $t('_tutorial.step3_4') }}</small>
+	</div>
+	<div class="_content" v-else-if="tutorial === 3">
+		<div>{{ $t('_tutorial.step4_1') }}</div>
+		<div>{{ $t('_tutorial.step4_2') }}</div>
+	</div>
+	<div class="_content" v-else-if="tutorial === 4">
+		<div>{{ $t('_tutorial.step5_1') }}</div>
+		<i18n path="_tutorial.step5_2" tag="div">
+			<router-link class="_link" place="featured" to="/featured">{{ $t('featured') }}</router-link>
+			<router-link class="_link" place="explore" to="/explore">{{ $t('explore') }}</router-link>
+		</i18n>
+		<div>{{ $t('_tutorial.step5_3') }}</div>
+		<small>{{ $t('_tutorial.step5_4') }}</small>
+	</div>
+	<div class="_content" v-else-if="tutorial === 5">
+		<div>{{ $t('_tutorial.step6_1') }}</div>
+		<div>{{ $t('_tutorial.step6_2') }}</div>
+		<div>{{ $t('_tutorial.step6_3') }}</div>
+	</div>
+	<div class="_content" v-else-if="tutorial === 6">
+		<div>{{ $t('_tutorial.step7_1') }}</div>
+		<i18n path="_tutorial.step7_2" tag="div">
+			<router-link class="_link" place="help" to="/docs">{{ $t('help') }}</router-link>
+		</i18n>
+		<div>{{ $t('_tutorial.step7_3') }}</div>
+	</div>
+
+	<div class="_footer navigation">
+		<div class="step">
+			<button class="arrow _button" @click="tutorial--" :disabled="tutorial === 0">
+				<fa :icon="faChevronLeft"/>
+			</button>
+			<span>{{ tutorial + 1 }} / 7</span>
+			<button class="arrow _button" @click="tutorial++" :disabled="tutorial === 6">
+				<fa :icon="faChevronRight"/>
+			</button>
+		</div>
+		<mk-button class="ok" @click="tutorial = -1" primary v-if="tutorial === 6"><fa :icon="faCheck"/> {{ $t('gotIt') }}</mk-button>
+		<mk-button class="ok" @click="tutorial++" primary v-else><fa :icon="faCheck"/> {{ $t('next') }}</mk-button>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faInfoCircle, faChevronLeft, faChevronRight, faCheck } from '@fortawesome/free-solid-svg-icons'
+import MkButton from '../components/ui/button.vue';
+
+export default Vue.extend({
+	components: {
+		MkButton,
+	},
+
+	data() {
+		return {
+			faInfoCircle, faChevronLeft, faChevronRight, faCheck
+		}
+	},
+
+	computed: {
+		tutorial: {
+			get() { return this.$store.state.settings.tutorial || 0; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'tutorial', value }); }
+		},
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.tbkwesmv {
+	> ._content {
+		> small {
+			opacity: 0.7;
+		}
+	}
+
+	> .navigation {
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+
+		> .step {
+			> .arrow {
+				padding: 4px;
+
+				&:disabled {
+					opacity: 0.5;
+				}
+
+				&:first-child {
+					padding-right: 8px;
+				}
+
+				&:last-child {
+					padding-left: 8px;
+				}
+			}
+
+			> span {
+				margin: 0 4px;
+			}
+		}
+
+		> .ok {
+			margin-left: auto;
+		}
+	}
+}
+</style>

src/client/pages/index.home.vue

@@ -13,6 +13,9 @@
 			<fa :icon="menuOpened ? faAngleUp : faAngleDown" style="margin-left: 8px;"/>
 		</button>
 	</portal>
+
+	<x-tutorial class="tutorial" v-if="$store.state.settings.tutorial != -1"/>
+
 	<x-timeline ref="tl" :key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src" :src="src" :list="list" :antenna="antenna" @before="before()" @after="after()"/>
 </div>
 </template>
@@ -23,6 +26,7 @@ import { faAngleDown, faAngleUp, faHome, faShareAlt, faGlobe, faListUl, faSatell
 import { faComments } from '@fortawesome/free-regular-svg-icons';
 import Progress from '../scripts/loading';
 import XTimeline from '../components/timeline.vue';
+import XTutorial from './index.home.tutorial.vue';
 
 export default Vue.extend({
 	metaInfo() {
@@ -32,7 +36,8 @@ export default Vue.extend({
 	},
 
 	components: {
-		XTimeline
+		XTimeline,
+		XTutorial,
 	},
 
 	props: {
@@ -57,7 +62,7 @@ export default Vue.extend({
 			return {
 				't': this.focus
 			};
-		}
+		},
 	},
 
 	watch: {
@@ -78,21 +83,11 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.$root.getMeta().then((meta: Record<string, any>) => {
-			if (!(
-				this.enableGlobalTimeline = !meta.disableGlobalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && this.src === 'global') this.src = 'local';
-			if (!(
-				this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && ['local', 'social'].includes(this.src)) this.src = 'home';
-		});
-		if (this.$store.state.device.tl) {
-			this.src = this.$store.state.device.tl.src;
+		this.src = this.$store.state.deviceUser.tl.src;
 		if (this.src === 'list') {
-				this.list = this.$store.state.device.tl.arg;
+			this.list = this.$store.state.deviceUser.tl.arg;
 		} else if (this.src === 'antenna') {
-				this.antenna = this.$store.state.device.tl.arg;
-			}
+			this.antenna = this.$store.state.deviceUser.tl.arg;
 		}
 	},
 
@@ -159,7 +154,7 @@ export default Vue.extend({
 		},
 
 		saveSrc() {
-			this.$store.commit('device/setTl', {
+			this.$store.commit('deviceUser/setTl', {
 				src: this.src,
 				arg: this.src == 'list' ? this.list : this.antenna
 			});
@@ -172,7 +167,13 @@ export default Vue.extend({
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+.mk-home {
+	> .tutorial {
+		margin-bottom: var(--margin);
+	}
+}
+
 ._kjvfvyph_ {
 	position: relative;
 	height: 100%;

src/client/pages/index.welcome.entrance.vue

@@ -1,10 +1,10 @@
 <template>
 <div class="rsqzvsbo">
-	<div class="_panel about">
-		<div class="banner" :style="{ backgroundImage: `url(${ banner })` }"></div>
+	<div class="_panel about" v-if="meta">
+		<div class="banner" :style="{ backgroundImage: `url(${ meta.bannerUrl })` }"></div>
 		<div class="body">
-			<h1 class="name" v-html="name || host"></h1>
-			<div class="desc" v-html="description || $t('introMisskey')"></div>
+			<h1 class="name" v-html="meta.name || host"></h1>
+			<div class="desc" v-html="meta.description || $t('introMisskey')"></div>
 			<mk-button @click="signup()" style="display: inline-block; margin-right: 16px;" primary>{{ $t('signup') }}</mk-button>
 			<mk-button @click="signin()" style="display: inline-block;">{{ $t('login') }}</mk-button>
 		</div>
@@ -39,23 +39,16 @@ export default Vue.extend({
 				noPaging: true,
 			},
 			host: toUnicode(host),
-			meta: null,
-			name: null,
-			description: null,
-			banner: null,
-			announcements: [],
 		};
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-			this.name = meta.name;
-			this.description = meta.description;
-			this.announcements = meta.announcements;
-			this.banner = meta.bannerUrl;
-		});
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
 
+	created() {
 		this.$root.api('stats').then(stats => {
 			this.stats = stats;
 		});

src/client/pages/index.welcome.vue

@@ -10,7 +10,7 @@
 import Vue from 'vue';
 import XSetup from './index.welcome.setup.vue';
 import XEntrance from './index.welcome.entrance.vue';
-import { getInstanceName } from '../scripts/get-instance-name';
+import { instanceName } from '../config';
 
 export default Vue.extend({
 	components: {
@@ -20,15 +20,14 @@ export default Vue.extend({
 
 	data() {
 		return {
-			meta: null,
-			instanceName: getInstanceName(),
+			instanceName: instanceName || 'Misskey',
 		}
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	}
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
 });
 </script>

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

@@ -98,7 +98,7 @@
 		<div class="operations">
 			<span class="label">{{ $t('operations') }}</span>
 			<mk-switch v-model="isSuspended" class="switch">{{ $t('stopActivityDelivery') }}</mk-switch>
-			<mk-switch v-model="isBlocked" class="switch">{{ $t('blockThisInstance') }}</mk-switch>
+			<mk-switch :value="isBlocked" class="switch" @change="changeBlock">{{ $t('blockThisInstance') }}</mk-switch>
 		</div>
 		<details class="metadata">
 			<summary class="label">{{ $t('metadata') }}</summary>
@@ -147,9 +147,7 @@ export default Vue.extend({
 
 	data() {
 		return {
-			meta: null,
-			isSuspended: false,
-			isBlocked: false,
+			isSuspended: this.instance.isSuspended,
 			now: null,
 			chart: null,
 			chartInstance: null,
@@ -184,6 +182,14 @@ export default Vue.extend({
 				null;
 
 			return stats;
+		},
+
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+
+		isBlocked() {
+			return this.meta && this.meta.blockedHosts.includes(this.instance.host);
 		}
 	},
 
@@ -195,12 +201,6 @@ export default Vue.extend({
 			});
 		},
 
-		isBlocked() {
-			this.$root.api('admin/update-meta', {
-				blockedHosts: this.isBlocked ? this.meta.blockedHosts.concat([this.instance.host]) : this.meta.blockedHosts.filter(x => x !== this.instance.host)
-			});
-		},
-
 		chartSrc() {
 			this.renderChart();
 		},
@@ -211,12 +211,6 @@ export default Vue.extend({
 	},
 
 	async created() {	
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-			this.isSuspended = this.instance.isSuspended;
-			this.isBlocked = this.meta.blockedHosts.includes(this.instance.host);
-		});
-	
 		this.now = new Date();
 
 		const [perHour, perDay] = await Promise.all([
@@ -235,6 +229,12 @@ export default Vue.extend({
 	},
 
 	methods: {
+		changeBlock(e) {
+			this.$root.api('admin/update-meta', {
+				blockedHosts: this.isBlocked ? this.meta.blockedHosts.concat([this.instance.host]) : this.meta.blockedHosts.filter(x => x !== this.instance.host)
+			});
+		},
+
 		setSrc(src) {
 			this.chartSrc = src;
 		},

src/client/pages/instance/index.vue

@@ -20,6 +20,9 @@
 	</section>
 
 	<section class="_card info">
+		<div class="_content">
+			<mk-input v-model="maxNoteTextLength" type="number" :save="() => save()" style="margin:0;"><template #icon><fa :icon="faPencilAlt"/></template>{{ $t('maxNoteTextLength') }}</mk-input>
+		</div>
 		<div class="_content">
 			<mk-switch v-model="enableLocalTimeline" @change="save()">{{ $t('enableLocalTimeline') }}</mk-switch>
 			<mk-switch v-model="enableGlobalTimeline" @change="save()">{{ $t('enableGlobalTimeline') }}</mk-switch>
@@ -40,8 +43,8 @@
 		<div class="_content">
 			<mk-switch v-model="enableRecaptcha">{{ $t('enableRecaptcha') }}</mk-switch>
 			<template v-if="enableRecaptcha">
-				<mk-info>{{ $t('recaptcha-info') }}</mk-info>
-				<mk-info warn>{{ $t('recaptcha-info2') }}</mk-info>
+				<mk-info>{{ $t('recaptchaInfo') }}</mk-info>
+				<mk-info warn>{{ $t('recaptchaInfo2') }}</mk-info>
 				<mk-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('recaptchaSiteKey') }}</mk-input>
 				<mk-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><template #icon><fa :icon="faKey"/></template>{{ $t('recaptchaSecretKey') }}</mk-input>
 			</template>
@@ -58,12 +61,12 @@
 	<section class="_card">
 		<div class="_title"><fa :icon="faBolt"/> {{ $t('serviceworker') }}</div>
 		<div class="_content">
-			<mk-switch v-model="enableServiceWorker">{{ $t('enableServiceworker') }}<template #desc>{{ $t('serviceworker-info') }}</template></mk-switch>
+			<mk-switch v-model="enableServiceWorker">{{ $t('enableServiceworker') }}<template #desc>{{ $t('serviceworkerInfo') }}</template></mk-switch>
 			<template v-if="enableServiceWorker">
-				<mk-info>{{ $t('vapid-info') }}<br><code>npm i web-push -g<br>web-push generate-vapid-keys</code></mk-info>
+				<mk-info>{{ $t('vapidInfo') }}<br><code>npx web-push generate-vapid-keys</code></mk-info>
 				<mk-horizon-group inputs class="fit-bottom">
-					<mk-input v-model="swPublicKey" :disabled="!enableServiceWorker"><template #icon><fa :icon="faKey"/></template>{{ $t('vapid-publickey') }}</mk-input>
-					<mk-input v-model="swPrivateKey" :disabled="!enableServiceWorker"><template #icon><fa :icon="faKey"/></template>{{ $t('vapid-privatekey') }}</mk-input>
+					<mk-input v-model="swPublicKey" :disabled="!enableServiceWorker"><template #icon><fa :icon="faKey"/></template>Public key</mk-input>
+					<mk-input v-model="swPrivateKey" :disabled="!enableServiceWorker"><template #icon><fa :icon="faKey"/></template>Private key</mk-input>
 				</mk-horizon-group>
 			</template>
 		</div>
@@ -120,30 +123,30 @@
 	<section class="_card">
 		<div class="_title"><fa :icon="faShareAlt"/> {{ $t('integration') }}</div>
 		<div class="_content">
-			<header><fa :icon="faTwitter"/> {{ $t('twitter-integration-config') }}</header>
-			<mk-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</mk-switch>
+			<header><fa :icon="faTwitter"/> Twitter</header>
+			<mk-switch v-model="enableTwitterIntegration">{{ $t('enable') }}</mk-switch>
 			<template v-if="enableTwitterIntegration">
-				<mk-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('twitter-integration-consumer-key') }}</mk-input>
-				<mk-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('twitter-integration-consumer-secret') }}</mk-input>
-				<mk-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</mk-info>
+				<mk-info>Callback URL: {{ `${url}/api/tw/cb` }}</mk-info>
+				<mk-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>Consumer Key</mk-input>
+				<mk-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>Consumer Secret</mk-input>
 			</template>
 		</div>
 		<div class="_content">
-			<header><fa :icon="faGithub"/> {{ $t('github-integration-config') }}</header>
-			<mk-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</mk-switch>
+			<header><fa :icon="faGithub"/> GitHub</header>
+			<mk-switch v-model="enableGithubIntegration">{{ $t('enable') }}</mk-switch>
 			<template v-if="enableGithubIntegration">
-				<mk-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('github-integration-client-id') }}</mk-input>
-				<mk-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('github-integration-client-secret') }}</mk-input>
-				<mk-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</mk-info>
+				<mk-info>Callback URL: {{ `${url}/api/gh/cb` }}</mk-info>
+				<mk-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>Client ID</mk-input>
+				<mk-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>Client Secret</mk-input>
 			</template>
 		</div>
 		<div class="_content">
-			<header><fa :icon="faDiscord"/> {{ $t('discord-integration-config') }}</header>
-			<mk-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</mk-switch>
+			<header><fa :icon="faDiscord"/> Discord</header>
+			<mk-switch v-model="enableDiscordIntegration">{{ $t('enable') }}</mk-switch>
 			<template v-if="enableDiscordIntegration">
-				<mk-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('discord-integration-client-id') }}</mk-input>
-				<mk-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('discord-integration-client-secret') }}</mk-input>
-				<mk-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</mk-info>
+				<mk-info>Callback URL: {{ `${url}/api/dc/cb` }}</mk-info>
+				<mk-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>Client ID</mk-input>
+				<mk-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>Client Secret</mk-input>
 			</template>
 		</div>
 		<div class="_footer">
@@ -171,7 +174,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faShareAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faThumbtack, faUser, faShieldAlt, faKey, faBolt } from '@fortawesome/free-solid-svg-icons';
+import { faPencilAlt, faShareAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faThumbtack, faUser, faShieldAlt, faKey, faBolt } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import { faTwitter, faDiscord, faGithub } from '@fortawesome/free-brands-svg-icons';
 import MkButton from '../../components/ui/button.vue';
@@ -180,7 +183,7 @@ import MkTextarea from '../../components/ui/textarea.vue';
 import MkSwitch from '../../components/ui/switch.vue';
 import MkInfo from '../../components/ui/info.vue';
 import MkUserSelect from '../../components/user-select.vue';
-import { version } from '../../config';
+import { version, url } from '../../config';
 import i18n from '../../i18n';
 import getAcct from '../../../misc/acct/render';
 
@@ -204,7 +207,7 @@ export default Vue.extend({
 	data() {
 		return {
 			version,
-			meta: null,
+			url,
 			stats: null,
 			serverInfo: null,
 			proxyAccount: null,
@@ -222,6 +225,7 @@ export default Vue.extend({
 			tosUrl: null,
 			bannerUrl: null,
 			iconUrl: null,
+			maxNoteTextLength: 0,
 			enableRegistration: false,
 			enableLocalTimeline: false,
 			enableGlobalTimeline: false,
@@ -240,13 +244,17 @@ export default Vue.extend({
 			enableDiscordIntegration: false,
 			discordClientId: null,
 			discordClientSecret: null,
-			faTwitter, faDiscord, faGithub, faShareAlt, faTrashAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faEnvelope, faThumbtack, faUser, faShieldAlt, faKey, faBolt
+			faPencilAlt, faTwitter, faDiscord, faGithub, faShareAlt, faTrashAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faEnvelope, faThumbtack, faUser, faShieldAlt, faKey, faBolt
 		}
 	},
 
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
+
 	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
 		this.name = this.meta.name;
 		this.description = this.meta.description;
 		this.tosUrl = this.meta.tosUrl;
@@ -254,6 +262,7 @@ export default Vue.extend({
 		this.iconUrl = this.meta.iconUrl;
 		this.maintainerName = this.meta.maintainerName;
 		this.maintainerEmail = this.meta.maintainerEmail;
+		this.maxNoteTextLength = this.meta.maxNoteTextLength;
 		this.enableRegistration = !this.meta.disableRegistration;
 		this.enableLocalTimeline = !this.meta.disableLocalTimeline;
 		this.enableGlobalTimeline = !this.meta.disableGlobalTimeline;
@@ -285,7 +294,6 @@ export default Vue.extend({
 				this.proxyAccount = proxyAccount;
 			});
 		}
-		});
 
 		this.$root.api('admin/server-info').then(res => {
 			this.serverInfo = res;
@@ -346,6 +354,7 @@ export default Vue.extend({
 				iconUrl: this.iconUrl,
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
+				maxNoteTextLength: this.maxNoteTextLength,
 				disableRegistration: !this.enableRegistration,
 				disableLocalTimeline: !this.enableLocalTimeline,
 				disableGlobalTimeline: !this.enableGlobalTimeline,
@@ -372,6 +381,7 @@ export default Vue.extend({
 				discordClientId: this.discordClientId,
 				discordClientSecret: this.discordClientSecret,
 			}).then(() => {
+				this.$store.dispatch('instance/fetch');
 				if (withDialog) {
 					this.$root.dialog({
 						type: 'success',

src/client/pages/messaging-room.form.vue

@@ -100,7 +100,7 @@ export default Vue.extend({
 					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, '1')}${ext}`;
 					const name = this.$store.state.settings.pasteDialog
 						? await this.$root.dialog({
-							title: this.$t('@.post-form.enter-file-name'),
+							title: this.$t('enterFileName'),
 							input: {
 								default: formatted
 							},
@@ -247,6 +247,7 @@ export default Vue.extend({
 		padding: 16px 16px 0 16px;
 		resize: none;
 		font-size: 1em;
+		font-family: inherit;
 		outline: none;
 		border: none;
 		border-radius: 0;
@@ -270,12 +271,8 @@ export default Vue.extend({
 		margin: 0;
 		padding: 16px;
 		font-size: 1em;
-		color: #aaa;
 		transition: color 0.1s ease;
-
-		&:hover {
 		color: var(--accent);
-		}
 
 		&:active {
 			color: var(--accentDarken);
@@ -337,7 +334,6 @@ export default Vue.extend({
 		font-size: 1em;
 		font-weight: normal;
 		text-decoration: none;
-		color: #aaa;
 		transition: color 0.1s ease;
 
 		&:hover {

src/client/pages/messaging-room.message.vue

@@ -3,7 +3,7 @@
 	<mk-avatar class="avatar" :user="message.user"/>
 	<div class="content">
 		<div class="balloon _panel" :data-no-text="message.text == null">
-			<button class="delete-button" v-if="isMe" :title="$t('@.delete')" @click="del">
+			<button class="delete-button" v-if="isMe" :title="$t('delete')" @click="del">
 				<img src="/assets/desktop/remove.png" alt="Delete"/>
 			</button>
 			<div class="content" v-if="!message.isDeleted">
@@ -231,7 +231,6 @@ export default Vue.extend({
 			display: block;
 			margin: 2px 0 0 0;
 			font-size: 10px;
-			color: var(--messagingRoomMessageInfo);
 
 			> .read {
 				margin: 0 8px;
@@ -288,6 +287,7 @@ export default Vue.extend({
 
 			> .balloon {
 				background: $me-balloon-color;
+				box-shadow: 0 6px 16px var(--accentShadow);
 				text-align: left;
 
 				&[data-no-text] {

src/client/pages/messaging-room.vue

@@ -8,15 +8,16 @@
 		<portal to="avatar"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
 	</template>
 	<template v-if="!fetching && group">
+		<portal to="icon"><fa :icon="faUsers"/></portal>
 		<portal to="title">{{ group.name }}</portal>
 	</template>
 
 	<div class="body">
 		<mk-loading v-if="fetching"/>
-		<p class="empty" v-if="!fetching && messages.length == 0"><fa icon="info-circle"/>{{ user ? $t('not-talked-user') : $t('not-talked-group') }}</p>
+		<p class="empty" v-if="!fetching && messages.length == 0"><fa :icon="faInfoCircle"/>{{ $t('noMessagesYet') }}</p>
 		<p class="no-history" v-if="!fetching && messages.length > 0 && !existMoreMessages"><fa :icon="faFlag"/>{{ $t('noMoreHistory') }}</p>
 		<button class="more _button" :class="{ fetching: fetchingMoreMessages }" v-if="existMoreMessages" @click="fetchMoreMessages" :disabled="fetchingMoreMessages">
-			<template v-if="fetchingMoreMessages"><fa icon="spinner" pulse fixed-width/></template>{{ fetchingMoreMessages ? $t('@.loading') : $t('@.load-more') }}
+			<template v-if="fetchingMoreMessages"><fa icon="spinner" pulse fixed-width/></template>{{ fetchingMoreMessages ? $t('loading') : $t('loadMore') }}
 		</button>
 		<x-list class="messages" :items="messages" v-slot="{ item: message, i }" direction="up" reversed>
 			<x-message :message="message" :is-group="group != null" :key="message.id"/>
@@ -25,7 +26,7 @@
 	<footer>
 		<transition name="fade">
 			<div class="new-message" v-show="showIndicator">
-				<button class="_buttonPrimary" @click="onIndicatorClick"><i><fa :icon="faArrowCircleDown"/></i>{{ $t('new-message') }}</button>
+				<button class="_buttonPrimary" @click="onIndicatorClick"><i><fa :icon="faArrowCircleDown"/></i>{{ $t('newMessageExists') }}</button>
 			</div>
 		</transition>
 		<x-form v-if="!fetching" :user="user" :group="group" ref="form"/>
@@ -35,7 +36,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faArrowCircleDown, faFlag } from '@fortawesome/free-solid-svg-icons';
+import { faArrowCircleDown, faFlag, faUsers, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../i18n';
 import XList from '../components/date-separated-list.vue';
 import XMessage from './messaging-room.message.vue';
@@ -63,7 +64,7 @@ export default Vue.extend({
 			connection: null,
 			showIndicator: false,
 			timer: null,
-			faArrowCircleDown, faFlag
+			faArrowCircleDown, faFlag, faUsers, faInfoCircle
 		};
 	},
 
@@ -138,7 +139,7 @@ export default Vue.extend({
 			} else if (e.dataTransfer.files.length > 1) {
 				this.$root.dialog({
 					type: 'error',
-					text: this.$t('only-one-file-attached')
+					text: this.$t('onlyOneFileCanBeAttached')
 				});
 				return;
 			}

src/client/pages/messaging.vue

@@ -150,7 +150,7 @@ export default Vue.extend({
 				showCancelButton: true
 			});
 			if (canceled) return;
-			this.navigateGroup(group);
+			this.$router.push(`/my/messaging/group/${group.id}`);
 		}
 	}
 });

src/client/pages/my-groups/index.vue

@@ -17,13 +17,13 @@
 
 	<mk-container :body-togglable="true">
 		<template #header><fa :icon="faEnvelopeOpenText"/> {{ $t('invites') }}</template>
-		<mk-pagination :pagination="invitePagination" #default="{items}" ref="invites">
-			<div class="_frame" v-for="invite in items" :key="invite.id">
-				<div class="_title">{{ invite.group.name }}</div>
-				<div class="_content"><mk-avatars :user-ids="invite.group.userIds"/></div>
+		<mk-pagination :pagination="invitationPagination" #default="{items}" ref="invitations">
+			<div class="_frame" v-for="invitation in items" :key="invitation.id">
+				<div class="_title">{{ invitation.group.name }}</div>
+				<div class="_content"><mk-avatars :user-ids="invitation.group.userIds"/></div>
 				<div class="_footer">
-					<mk-button @click="acceptInvite(invite)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button>
-					<mk-button @click="rejectInvite(invite)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button>
+					<mk-button @click="acceptInvite(invitation)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button>
+					<mk-button @click="rejectInvite(invitation)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button>
 				</div>
 			</div>
 		</mk-pagination>
@@ -73,7 +73,7 @@ export default Vue.extend({
 				endpoint: 'users/groups/joined',
 				limit: 10,
 			},
-			invitePagination: {
+			invitationPagination: {
 				endpoint: 'i/user-group-invites',
 				limit: 10,
 			},
@@ -95,23 +95,23 @@ export default Vue.extend({
 				iconOnly: true, autoClose: true
 			});
 		},
-		acceptInvite(invite) {
+		acceptInvite(invitation) {
 			this.$root.api('users/groups/invitations/accept', {
-				inviteId: invite.id
+				invitationId: invitation.id
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
 					iconOnly: true, autoClose: true
 				});
-				this.$refs.invites.reload();
+				this.$refs.invitations.reload();
 				this.$refs.joined.reload();
 			});
 		},
-		rejectInvite(invite) {
+		rejectInvite(invitation) {
 			this.$root.api('users/groups/invitations/reject', {
-				inviteId: invite.id
+				invitationId: invitation.id
 			}).then(() => {
-				this.$refs.invites.reload();
+				this.$refs.invitations.reload();
 			});
 		}
 	}

src/client/pages/not-found.vue

@@ -5,7 +5,7 @@
 
 	<section class="_card">
 		<div class="_content">
-			<img src="https://xn--931a.moe/assets/not-found.jpg" alt=""/>
+			<img src="https://xn--931a.moe/assets/not-found.png" alt=""/>
 			<div>{{ $t('notFoundDescription') }}</div>
 		</div>
 	</section>
@@ -45,6 +45,8 @@ export default Vue.extend({
 				height: 150px;
 				margin-bottom: 16px;
 				border-radius: 16px;
+				pointer-events: none;
+				user-select: none;
 			}
 		}
 	}

src/client/pages/note.vue

@@ -1,5 +1,8 @@
 <template>
 <div class="mk-note-page">
+	<portal to="avatar" v-if="note"><mk-avatar class="avatar" :user="note.user" :disable-preview="true"/></portal>
+	<portal to="title" v-if="note">{{ $t('noteOf', { user: note.user.name }) }}</portal>
+
 	<transition name="zoom" mode="out-in">
 		<x-note v-if="note" :note="note" :key="note.id" :detail="true"/>
 		<div v-else-if="error">

src/client/pages/settings/general.vue

@@ -23,10 +23,19 @@
 		<mk-button @click="readAllMessagingMessages">{{ $t('markAsReadAllTalkMessages') }}</mk-button>
 	</div>
 	<div class="_content">
-		<mk-switch v-model="reduceAnimation">
-			{{ $t('reduceUiAnimation') }}
+		<mk-switch v-model="reduceAnimation">{{ $t('reduceUiAnimation') }}</mk-switch>
+		<mk-switch v-model="useOsNativeEmojis">
+			{{ $t('useOsNativeEmojis') }}
+			<template #desc><mfm text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></template>
 		</mk-switch>
 	</div>
+	<div class="_content">
+		<mk-select v-model="lang">
+			<template #label>{{ $t('uiLanguage') }}</template>
+
+			<option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
+		</mk-select>
+	</div>
 </section>
 </template>
 
@@ -36,8 +45,9 @@ import { faImage, faCog } from '@fortawesome/free-solid-svg-icons';
 import MkInput from '../../components/ui/input.vue';
 import MkButton from '../../components/ui/button.vue';
 import MkSwitch from '../../components/ui/switch.vue';
+import MkSelect from '../../components/ui/select.vue';
 import i18n from '../../i18n';
-import { apiUrl } from '../../config';
+import { apiUrl, langs } from '../../config';
 
 export default Vue.extend({
 	i18n,
@@ -46,10 +56,13 @@ export default Vue.extend({
 		MkInput,
 		MkButton,
 		MkSwitch,
+		MkSelect,
 	},
 	
 	data() {
 		return {
+			langs,
+			lang: localStorage.getItem('lang'),
 			wallpaperUploading: false,
 			faImage, faCog
 		}
@@ -70,6 +83,19 @@ export default Vue.extend({
 			get() { return !this.$store.state.device.animation; },
 			set(value) { this.$store.commit('device/set', { key: 'animation', value: !value }); }
 		},
+
+		useOsNativeEmojis: {
+			get() { return this.$store.state.device.useOsNativeEmojis; },
+			set(value) { this.$store.commit('device/set', { key: 'useOsNativeEmojis', value }); }
+		},
+	},
+
+	watch: {
+		lang() {
+			localStorage.setItem('lang', this.lang);
+			localStorage.removeItem('locale');
+			location.reload();
+		}
 	},
 
 	methods: {

src/client/pages/settings/integration.vue

@@ -56,15 +56,17 @@ export default Vue.extend({
 	computed: {
 		integrations() {
 			return this.$store.state.i.integrations;
-		}
+		},
+		
+		meta() {
+			return this.$store.state.instance.meta;
+		},
 	},
 
 	created() {
-		this.$root.getMeta().then(meta => {
-			this.enableTwitterIntegration = meta.enableTwitterIntegration;
-			this.enableDiscordIntegration = meta.enableDiscordIntegration;
-			this.enableGithubIntegration = meta.enableGithubIntegration;
-		});
+		this.enableTwitterIntegration = this.meta.enableTwitterIntegration;
+		this.enableDiscordIntegration = this.meta.enableDiscordIntegration;
+		this.enableGithubIntegration = this.meta.enableGithubIntegration;
 	},
 
 	mounted() {

src/client/router.ts

@@ -20,6 +20,7 @@ export const router = new VueRouter({
 		{ path: '/@:user/pages/:pageName/view-source', component: page('page-editor/page-editor'), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 		{ path: '/announcements', component: page('announcements') },
 		{ path: '/about', component: page('about') },
+		{ path: '/about-misskey', component: page('about-misskey') },
 		{ path: '/featured', component: page('featured') },
 		{ path: '/docs', component: page('docs') },
 		{ path: '/docs/:doc', component: page('doc'), props: true },
@@ -31,6 +32,7 @@ export const router = new VueRouter({
 		{ path: '/my/mentions', component: page('mentions') },
 		{ path: '/my/messaging', name: 'messaging', component: page('messaging') },
 		{ path: '/my/messaging/:user', component: page('messaging-room') },
+		{ path: '/my/messaging/group/:group', component: page('messaging-room') },
 		{ path: '/my/drive', name: 'drive', component: page('drive') },
 		{ path: '/my/drive/folder/:folder', component: page('drive') },
 		{ path: '/my/pages', name: 'pages', component: page('pages') },
@@ -61,11 +63,16 @@ export const router = new VueRouter({
 	],
 	// なんかHacky
 	// 通常の使い方をすると scroll メソッドの behavior を設定できないため、自前で window.scroll するようにする
-	// setTimeout しないと、アニメーション(トランジション)の関係でうまく動かない
 	scrollBehavior(to) {
 		window._scroll = () => { // さらにHacky
 			if (to.name === 'index') {
 				window.scroll({ top: indexScrollPos, behavior: 'instant' });
+				const i = setInterval(() => {
+					window.scroll({ top: indexScrollPos, behavior: 'instant' });
+				}, 10);
+				setTimeout(() => {
+					clearInterval(i);
+				}, 500);
 			} else {
 				window.scroll({ top: 0, behavior: 'instant' });
 			}

src/client/scripts/get-instance-name.ts

@@ -1,8 +0,0 @@
-export function getInstanceName() {
-	const siteName = document.querySelector('meta[property="og:site_name"]') as HTMLMetaElement;
-	if (siteName && siteName.content) {
-		return siteName.content;
-	}
-
-	return 'Misskey';
-}

src/client/scripts/paging.ts

@@ -1,14 +1,45 @@
 import Vue from 'vue';
 
+function getScrollContainer(el: Element | null): Element | null {
+	if (el == null || el.tagName === 'BODY') return null;
+	const style = window.getComputedStyle(el);
+	if (style.getPropertyValue('overflow') === 'auto') {
+		return el;
+	} else {
+		return getScrollContainer(el.parentElement);
+	}
+}
+
+function getScrollPosition(el: Element | null): number {
+	const container = getScrollContainer(el);
+	return container == null ? window.scrollY : container.scrollTop;
+}
+
+function onScrollTop(el, cb) {
+	const container = getScrollContainer(el) || window;
+	const onScroll = ev => {
+		if (!document.body.contains(el)) return;
+		const pos = getScrollPosition(el);
+		if (pos === 0) {
+			cb();
+			container.removeEventListener('scroll', onscroll);
+		}
+	};
+	container.addEventListener('scroll', onScroll, { passive: true });
+}
+
 export default (opts) => ({
 	data() {
 		return {
 			items: [],
+			queue: [],
 			offset: 0,
 			fetching: true,
 			moreFetching: false,
 			inited: false,
-			more: false
+			more: false,
+			backed: false,
+			isBackTop: false,
 		};
 	},
 
@@ -31,13 +62,17 @@ export default (opts) => ({
 	created() {
 		opts.displayLimit = opts.displayLimit || 30;
 		this.init();
+
+		this.$on('hook:activated', () => {
+			this.isBackTop = false;
+		});
+
+		this.$on('hook:deactivated', () => {
+			this.isBackTop = window.scrollY === 0;
+		});
 	},
 
 	methods: {
-		isScrollTop() {
-			return window.scrollY <= 8;
-		},
-
 		updateItem(i, item) {
 			Vue.set((this as any).items, i, item);
 		},
@@ -78,6 +113,7 @@ export default (opts) => ({
 		async fetchMore() {
 			if (!this.more || this.moreFetching || this.items.length === 0) return;
 			this.moreFetching = true;
+			this.backed = true;
 			let params = typeof this.pagination.params === 'function' ? this.pagination.params(false) : this.pagination.params;
 			if (params && params.then) params = await params;
 			const endpoint = typeof this.pagination.endpoint === 'function' ? this.pagination.endpoint() : this.pagination.endpoint;
@@ -105,21 +141,26 @@ export default (opts) => ({
 			});
 		},
 
-		prepend(item, silent = false) {
-			if (opts.onPrepend) {
-				const cancel = opts.onPrepend(this, item, silent);
-				if (cancel) return;
-			}
+		prepend(item) {
+			const isTop = this.isBackTop || (document.body.contains(this.$el) && (getScrollPosition(this.$el) === 0));
 
+			if (isTop) {
 				// Prepend the item
 				this.items.unshift(item);
 
-			if (this.isScrollTop()) {
-				// オーバーフローしたら古い投稿は捨てる
+				// オーバーフローしたら古いアイテムは捨てる
 				if (this.items.length >= opts.displayLimit) {
 					this.items = this.items.slice(0, opts.displayLimit);
 					this.more = true;
 				}
+			} else {
+				this.queue.push(item);
+				onScrollTop(this.$el, () => {
+					for (const item of this.queue) {
+						this.prepend(item);
+					}
+					this.queue = [];
+				});
 			}
 		},
 

src/client/scripts/please-login.ts

@@ -2,7 +2,7 @@ export default ($root: any) => {
 	if ($root.$store.getters.isSignedIn) return;
 
 	$root.dialog({
-		title: $root.$t('@.signin-required'),
+		title: $root.$t('signinRequired'),
 		text: null
 	});
 

src/client/scripts/stream.ts

@@ -9,7 +9,7 @@ import MiOS from '../mios';
  */
 export default class Stream extends EventEmitter {
 	private stream: ReconnectingWebsocket;
-	public state: string;
+	public state: 'initializing' | 'reconnecting' | 'connected';
 	private sharedConnectionPools: Pool[] = [];
 	private sharedConnections: SharedConnection[] = [];
 	private nonSharedConnections: NonSharedConnection[] = [];

src/client/store.ts

@@ -5,6 +5,7 @@ import * as nestedProperty from 'nested-property';
 import MiOS from './mios';
 
 const defaultSettings = {
+	tutorial: 0,
 	keepCw: false,
 	showFullAcct: false,
 	rememberNoteVisibility: false,
@@ -15,27 +16,38 @@ const defaultSettings = {
 	wallpaper: null,
 	memo: null,
 	reactions: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
-	widgets: []
+};
+
+const defaultDeviceUserSettings = {
+	visibility: 'public',
+	localOnly: false,
+	widgets: [],
+	tl: {
+		src: 'home'
+	},
 };
 
 const defaultDeviceSettings = {
 	lang: null,
 	loadRawImages: false,
 	alwaysShowNsfw: false,
-	useOsDefaultEmojis: false,
+	useOsNativeEmojis: false,
 	autoReload: false,
 	accounts: [],
 	recentEmojis: [],
-	visibility: 'public',
-	localOnly: false,
 	themes: [],
 	theme: 'light',
 	animation: true,
+	userData: {},
 };
 
+function copy<T>(data: T): T {
+	return JSON.parse(JSON.stringify(data));
+}
+
 export default (os: MiOS) => new Vuex.Store({
 	plugins: [createPersistedState({
-		paths: ['i', 'device', 'settings']
+		paths: ['i', 'device', 'deviceUser', 'settings', 'instance']
 	})],
 
 	state: {
@@ -57,10 +69,11 @@ export default (os: MiOS) => new Vuex.Store({
 	},
 
 	actions: {
-		login(ctx, i) {
+		async login(ctx, i) {
 			ctx.commit('updateI', i);
-			ctx.dispatch('settings/merge', i.clientData);
-			ctx.dispatch('addAcount', { id: i.id, i: localStorage.getItem('i') });
+			ctx.commit('settings/init', i.clientData);
+			ctx.commit('deviceUser/init', ctx.state.device.userData[i.id] || {});
+			await ctx.dispatch('addAcount', { id: i.id, i: localStorage.getItem('i') });
 		},
 
 		addAcount(ctx, info) {
@@ -73,14 +86,17 @@ export default (os: MiOS) => new Vuex.Store({
 		},
 
 		logout(ctx) {
+			ctx.commit('device/setUserData', { userId: ctx.state.i.id, data: ctx.state.deviceUser });
 			ctx.commit('updateI', null);
+			ctx.commit('settings/init', {});
+			ctx.commit('deviceUser/init', {});
 			localStorage.removeItem('i');
 		},
 
-		switchAccount(ctx, i) {
-			ctx.commit('updateI', i);
-			ctx.commit('settings/init', i.clientData);
+		async switchAccount(ctx, i) {
+			ctx.commit('device/setUserData', { userId: ctx.state.i.id, data: ctx.state.deviceUser });
 			localStorage.setItem('i', i.token);
+			await ctx.dispatch('login', i);
 		},
 
 		mergeMe(ctx, me) {
@@ -89,12 +105,36 @@ export default (os: MiOS) => new Vuex.Store({
 			}
 
 			if (me.clientData) {
-				ctx.dispatch('settings/merge', me.clientData);
+				ctx.commit('settings/init', me.clientData);
 			}
 		},
 	},
 
 	modules: {
+		instance: {
+			namespaced: true,
+
+			state: {
+				meta: null
+			},
+
+			mutations: {
+				set(state, meta) {
+					state.meta = meta;
+				},
+			},
+
+			actions: {
+				async fetch(ctx) {
+					const meta = await os.api('meta', {
+						detail: false
+					});
+
+					ctx.commit('set', meta);
+				}
+			}
+		},
+
 		device: {
 			namespaced: true,
 
@@ -105,6 +145,32 @@ export default (os: MiOS) => new Vuex.Store({
 					state[x.key] = x.value;
 				},
 
+				setUserData(state, x: { userId: string; data: any }) {
+					state.userData[x.userId] = copy(x.data);
+				},
+			}
+		},
+
+		deviceUser: {
+			namespaced: true,
+
+			state: defaultDeviceUserSettings,
+
+			mutations: {
+				init(state, x) {
+					for (const [key, value] of Object.entries(defaultDeviceUserSettings)) {
+						if (x[key]) {
+							state[key] = x[key];
+						} else {
+							state[key] = value;
+						}
+					}
+				},
+
+				set(state, x: { key: string; value: any }) {
+					state[x.key] = x.value;
+				},
+
 				setTl(state, x) {
 					state.tl = {
 						src: x.src,
@@ -119,6 +185,25 @@ export default (os: MiOS) => new Vuex.Store({
 				setLocalOnly(state, localOnly) {
 					state.localOnly = localOnly;
 				},
+
+				setWidgets(state, widgets) {
+					state.widgets = widgets;
+				},
+
+				addWidget(state, widget) {
+					state.widgets.unshift(widget);
+				},
+
+				removeWidget(state, widget) {
+					state.widgets = state.widgets.filter(w => w.id != widget.id);
+				},
+
+				updateWidget(state, x) {
+					const w = state.widgets.find(w => w.id == x.id);
+					if (w) {
+						w.data = x.data;
+					}
+				},
 			}
 		},
 
@@ -144,13 +229,6 @@ export default (os: MiOS) => new Vuex.Store({
 			},
 
 			actions: {
-				merge(ctx, settings) {
-					if (settings == null) return;
-					for (const [key, value] of Object.entries(settings)) {
-						ctx.commit('set', { key, value });
-					}
-				},
-
 				set(ctx, x) {
 					ctx.commit('set', x);
 
@@ -161,41 +239,6 @@ export default (os: MiOS) => new Vuex.Store({
 						});
 					}
 				},
-
-				setWidgets(ctx, widgets) {
-					ctx.state.widgets = widgets;
-					ctx.dispatch('updateWidgets');
-				},
-
-				addWidget(ctx, widget) {
-					ctx.state.widgets.unshift(widget);
-					ctx.dispatch('updateWidgets');
-				},
-
-				removeWidget(ctx, widget) {
-					ctx.state.widgets = ctx.state.widgets.filter(w => w.id != widget.id);
-					ctx.dispatch('updateWidgets');
-				},
-
-				updateWidget(ctx, x) {
-					const w = ctx.state.widgets.find(w => w.id == x.id);
-					if (w) {
-						w.data = x.data;
-						ctx.dispatch('updateWidgets');
-					}
-				},
-
-				updateWidgets(ctx) {
-					const widgets = ctx.state.widgets;
-					ctx.commit('set', {
-						key: 'widgets',
-						value: widgets
-					});
-					os.api('i/update-client-setting', {
-						name: 'widgets',
-						value: widgets
-					});
-				},
 			}
 		}
 	}

src/client/style.scss

@@ -89,6 +89,8 @@ body {
 		width: 64px;
 		height: 64px;
 		animation: ini 0.6s infinite linear;
+		color: var(--accent);
+		fill: currentColor;
 	}
 }
 
@@ -196,6 +198,7 @@ a {
 	@extend ._button;
 	color: #fff;
 	background: var(--accent);
+	box-shadow: 0 6px 16px var(--accentShadow);
 
 	&:not(:disabled):hover {
 		background: var(--jkhztclx);
@@ -385,7 +388,7 @@ a {
 }
 
 @keyframes blink {
-	0% { opacity: 1; }
-	30% { opacity: 1; }
-	90% { opacity: 0; }
+	0% { opacity: 1; transform: scale(1); }
+	30% { opacity: 1; transform: scale(1); }
+	90% { opacity: 0; transform: scale(0.5); }
 }

src/client/sw.js

@@ -18,7 +18,7 @@ self.addEventListener('install', ev => {
 		caches.open(cacheName)
 			.then(cache => {
 				return cache.addAll([
-					'/'
+					`/?v=${version}`
 				]);
 			})
 			.then(() => self.skipWaiting())
@@ -45,7 +45,7 @@ self.addEventListener('fetch', ev => {
 				return response || fetch(ev.request);
 			})
 			.catch(() => {
-				return caches.match('/');
+				return caches.match(`/?v=${version}`);
 			})
 	);
 });

src/client/themes/dark.json5

@@ -10,6 +10,7 @@
 		accent: '#86b300',
 		accentDarken: ':darken<10<@accent',
 		accentLighten: ':lighten<10<@accent',
+		accentShadow: ':alpha<0.3<@accent',
 		focus: ':alpha<0.3<@accent',
 		bg: '#000',
 		fg: '#c7d1d8',

src/client/themes/light.json5

@@ -10,6 +10,7 @@
 		accent: '#86b300',
 		accentDarken: ':darken<10<@accent',
 		accentLighten: ':lighten<10<@accent',
+		accentShadow: ':alpha<0.4<@accent',
 		focus: ':alpha<0.3<@accent',
 		bg: '#fafafa',
 		fg: '#5c6a73',

src/client/widgets/define.ts

@@ -51,7 +51,7 @@ export default function <T extends object>(data: {
 			},
 
 			save() {
-				this.$store.dispatch('settings/updateWidget', this.widget);
+				this.$store.commit('deviceUser/updateWidget', this.widget);
 			}
 		}
 	});

src/db/postgre.ts

@@ -26,7 +26,7 @@ import { UserList } from '../models/entities/user-list';
 import { UserListJoining } from '../models/entities/user-list-joining';
 import { UserGroup } from '../models/entities/user-group';
 import { UserGroupJoining } from '../models/entities/user-group-joining';
-import { UserGroupInvite } from '../models/entities/user-group-invite';
+import { UserGroupInvitation } from '../models/entities/user-group-invitation';
 import { Hashtag } from '../models/entities/hashtag';
 import { NoteFavorite } from '../models/entities/note-favorite';
 import { AbuseUserReport } from '../models/entities/abuse-user-report';
@@ -106,7 +106,7 @@ export const entities = [
 	UserListJoining,
 	UserGroup,
 	UserGroupJoining,
-	UserGroupInvite,
+	UserGroupInvitation,
 	UserNotePining,
 	UserSecurityKey,
 	UsedUsername,

src/docs/keyboard-shortcut.ja-JP.md

@@ -10,6 +10,7 @@
 		<tr><td><kbd class="key">P</kbd>, <kbd class="key">N</kbd></td><td>新規投稿</td><td><b>P</b>ost, <b>N</b>ew, <b>N</b>ote</td></tr>
 		<tr><td><kbd class="key">T</kbd></td><td>タイムラインの最も新しい投稿にフォーカス</td><td><b>T</b>imeline, <b>T</b>op</td></tr>
 		<tr><td><kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">N</kbd></kbd></td><td>通知を表示/隠す</td><td><b>N</b>otifications</td></tr>
+		<tr><td><kbd class="key">S</kbd></td><td>検索</td><td><b>S</b>earch</td></tr>
 		<tr><td><kbd class="key">H</kbd>, <kbd class="key">?</kbd></td><td>ヘルプを表示</td><td><b>H</b>elp</td></tr>
 	</tbody>
 </table>

src/misc/fetch-proxy-account.ts

@@ -1,9 +1,10 @@
 import { fetchMeta } from './fetch-meta';
 import { ILocalUser } from '../models/entities/user';
 import { Users } from '../models';
+import { ensure } from '../prelude/ensure';
 
 export async function fetchProxyAccount(): Promise<ILocalUser | null> {
-	if (meta.proxyAccountId == null) return null;
 	const meta = await fetchMeta();
-	return await Users.findOne(meta.proxyAccountId);
+	if (meta.proxyAccountId == null) return null;
+	return await Users.findOne(meta.proxyAccountId).then(ensure) as ILocalUser;
 }

src/models/entities/notification.ts

@@ -3,6 +3,7 @@ import { User } from './user';
 import { id } from '../id';
 import { Note } from './note';
 import { FollowRequest } from './follow-request';
+import { UserGroupInvitation } from './user-group-invitation';
 
 @Entity()
 export class Notification {
@@ -57,12 +58,13 @@ export class Notification {
 	 * pollVote - (自分または自分がWatchしている)投稿の投票に投票された
 	 * receiveFollowRequest - フォローリクエストされた
 	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された
+	 * groupInvited - グループに招待された
 	 */
 	@Column('enum', {
-		enum: ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted'],
+		enum: ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited'],
 		comment: 'The type of the Notification.'
 	})
-	public type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollVote' | 'receiveFollowRequest' | 'followRequestAccepted';
+	public type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollVote' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited';
 
 	/**
 	 * 通知が読まれたかどうか
@@ -97,6 +99,18 @@ export class Notification {
 	@JoinColumn()
 	public followRequest: FollowRequest | null;
 
+	@Column({
+		...id(),
+		nullable: true
+	})
+	public userGroupInvitationId: UserGroupInvitation['id'] | null;
+
+	@ManyToOne(type => UserGroupInvitation, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public userGroupInvitation: UserGroupInvitation | null;
+
 	@Column('varchar', {
 		length: 128, nullable: true
 	})

src/models/entities/user-group-invitation.ts

@@ -5,12 +5,12 @@ import { id } from '../id';
 
 @Entity()
 @Index(['userId', 'userGroupId'], { unique: true })
-export class UserGroupInvite {
+export class UserGroupInvitation {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserGroupInvite.'
+		comment: 'The created date of the UserGroupInvitation.'
 	})
 	public createdAt: Date;
 

src/models/index.ts

@@ -24,7 +24,7 @@ import { UserListRepository } from './repositories/user-list';
 import { UserListJoining } from './entities/user-list-joining';
 import { UserGroupRepository } from './repositories/user-group';
 import { UserGroupJoining } from './entities/user-group-joining';
-import { UserGroupInviteRepository } from './repositories/user-group-invite';
+import { UserGroupInvitationRepository } from './repositories/user-group-invitation';
 import { FollowRequestRepository } from './repositories/follow-request';
 import { MutingRepository } from './repositories/muting';
 import { BlockingRepository } from './repositories/blocking';
@@ -71,7 +71,7 @@ export const UserLists = getCustomRepository(UserListRepository);
 export const UserListJoinings = getRepository(UserListJoining);
 export const UserGroups = getCustomRepository(UserGroupRepository);
 export const UserGroupJoinings = getRepository(UserGroupJoining);
-export const UserGroupInvites = getCustomRepository(UserGroupInviteRepository);
+export const UserGroupInvitations = getCustomRepository(UserGroupInvitationRepository);
 export const UserNotePinings = getRepository(UserNotePining);
 export const UsedUsernames = getRepository(UsedUsername);
 export const Followings = getCustomRepository(FollowingRepository);

src/models/repositories/notification.ts

@@ -1,5 +1,5 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users, Notes } from '..';
+import { Users, Notes, UserGroupInvitations } from '..';
 import { Notification } from '../entities/notification';
 import { ensure } from '../../prelude/ensure';
 import { awaitAll } from '../../prelude/await-all';
@@ -39,7 +39,10 @@ export class NotificationRepository extends Repository<Notification> {
 			...(notification.type === 'pollVote' ? {
 				note: Notes.pack(notification.note || notification.noteId!, notification.notifieeId),
 				choice: notification.choice
-			} : {})
+			} : {}),
+			...(notification.type === 'groupInvited' ? {
+				invitation: UserGroupInvitations.pack(notification.userGroupInvitationId!),
+			} : {}),
 		});
 	}
 

src/models/repositories/user-group-invitation.ts

@@ -0,0 +1,24 @@
+import { EntityRepository, Repository } from 'typeorm';
+import { UserGroupInvitation } from '../entities/user-group-invitation';
+import { UserGroups } from '..';
+import { ensure } from '../../prelude/ensure';
+
+@EntityRepository(UserGroupInvitation)
+export class UserGroupInvitationRepository extends Repository<UserGroupInvitation> {
+	public async pack(
+		src: UserGroupInvitation['id'] | UserGroupInvitation,
+	) {
+		const invitation = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
+
+		return {
+			id: invitation.id,
+			group: await UserGroups.pack(invitation.userGroup || invitation.userGroupId),
+		};
+	}
+
+	public packMany(
+		invitations: any[],
+	) {
+		return Promise.all(invitations.map(x => this.pack(x)));
+	}
+}

src/models/repositories/user-group-invite.ts

@@ -1,24 +0,0 @@
-import { EntityRepository, Repository } from 'typeorm';
-import { UserGroupInvite } from '../entities/user-group-invite';
-import { UserGroups } from '..';
-import { ensure } from '../../prelude/ensure';
-
-@EntityRepository(UserGroupInvite)
-export class UserGroupInviteRepository extends Repository<UserGroupInvite> {
-	public async pack(
-		src: UserGroupInvite['id'] | UserGroupInvite,
-	) {
-		const invite = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
-
-		return {
-			id: invite.id,
-			group: await UserGroups.pack(invite.userGroup || invite.userGroupId),
-		};
-	}
-
-	public packMany(
-		invites: any[],
-	) {
-		return Promise.all(invites.map(x => this.pack(x)));
-	}
-}

src/server/api/endpoints/announcements.ts

@@ -13,6 +13,11 @@ export const meta = {
 			default: 10
 		},
 
+		withUnreads: {
+			validator: $.optional.boolean,
+			default: false
+		},
+
 		sinceId: {
 			validator: $.optional.type(ID),
 		},
@@ -38,5 +43,5 @@ export default define(meta, async (ps, user) => {
 		}
 	}
 
-	return announcements;
+	return ps.withUnreads ? announcements.filter((a: any) => !a.isRead) : announcements;
 });

src/server/api/endpoints/i/user-group-invites.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
-import { UserGroupInvites } from '../../../../models';
+import { UserGroupInvitations } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 
 export const meta = {
@@ -33,13 +33,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const query = makePaginationQuery(UserGroupInvites.createQueryBuilder('invite'), ps.sinceId, ps.untilId)
-		.andWhere(`invite.userId = :meId`, { meId: user.id })
-		.leftJoinAndSelect('invite.userGroup', 'user_group');
+	const query = makePaginationQuery(UserGroupInvitations.createQueryBuilder('invitation'), ps.sinceId, ps.untilId)
+		.andWhere(`invitation.userId = :meId`, { meId: user.id })
+		.leftJoinAndSelect('invitation.userGroup', 'user_group');
 
-	const invites = await query
+	const invitations = await query
 		.take(ps.limit!)
 		.getMany();
 
-	return await UserGroupInvites.packMany(invites);
+	return await UserGroupInvitations.packMany(invitations);
 });

src/server/api/endpoints/users/groups/invitations/accept.ts

@@ -2,14 +2,14 @@ import $ from 'cafy';
 import { ID } from '../../../../../../misc/cafy-id';
 import define from '../../../../define';
 import { ApiError } from '../../../../error';
-import { UserGroupJoinings, UserGroupInvites } from '../../../../../../models';
+import { UserGroupJoinings, UserGroupInvitations } from '../../../../../../models';
 import { genId } from '../../../../../../misc/gen-id';
 import { UserGroupJoining } from '../../../../../../models/entities/user-group-joining';
 
 export const meta = {
 	desc: {
 		'ja-JP': 'ユーザーグループへの招待を承認します。',
-		'en-US': 'Accept invite of a user group.'
+		'en-US': 'Accept invitation of a user group.'
 	},
 
 	tags: ['groups', 'users'],
@@ -19,11 +19,11 @@ export const meta = {
 	kind: 'write:user-groups',
 
 	params: {
-		inviteId: {
+		invitationId: {
 			validator: $.type(ID),
 			desc: {
 				'ja-JP': '招待ID',
-				'en-US': 'The invite ID'
+				'en-US': 'The invitation ID'
 			}
 		},
 	},
@@ -39,15 +39,15 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Fetch the invitation
-	const invite = await UserGroupInvites.findOne({
-		id: ps.inviteId,
+	const invitation = await UserGroupInvitations.findOne({
+		id: ps.invitationId,
 	});
 
-	if (invite == null) {
+	if (invitation == null) {
 		throw new ApiError(meta.errors.noSuchInvitation);
 	}
 
-	if (invite.userId !== user.id) {
+	if (invitation.userId !== user.id) {
 		throw new ApiError(meta.errors.noSuchInvitation);
 	}
 
@@ -56,8 +56,8 @@ export default define(meta, async (ps, user) => {
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
-		userGroupId: invite.userGroupId
+		userGroupId: invitation.userGroupId
 	} as UserGroupJoining);
 
-	UserGroupInvites.delete(invite.id);
+	UserGroupInvitations.delete(invitation.id);
 });

src/server/api/endpoints/users/groups/invitations/reject.ts

@@ -2,12 +2,12 @@ import $ from 'cafy';
 import { ID } from '../../../../../../misc/cafy-id';
 import define from '../../../../define';
 import { ApiError } from '../../../../error';
-import { UserGroupInvites } from '../../../../../../models';
+import { UserGroupInvitations } from '../../../../../../models';
 
 export const meta = {
 	desc: {
 		'ja-JP': 'ユーザーグループへの招待を拒否します。',
-		'en-US': 'Reject invite of a user group.'
+		'en-US': 'Reject invitation of a user group.'
 	},
 
 	tags: ['groups', 'users'],
@@ -17,11 +17,11 @@ export const meta = {
 	kind: 'write:user-groups',
 
 	params: {
-		inviteId: {
+		invitationId: {
 			validator: $.type(ID),
 			desc: {
 				'ja-JP': '招待ID',
-				'en-US': 'The invite ID'
+				'en-US': 'The invitation ID'
 			}
 		},
 	},
@@ -37,17 +37,17 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Fetch the invitation
-	const invite = await UserGroupInvites.findOne({
-		id: ps.inviteId,
+	const invitation = await UserGroupInvitations.findOne({
+		id: ps.invitationId,
 	});
 
-	if (invite == null) {
+	if (invitation == null) {
 		throw new ApiError(meta.errors.noSuchInvitation);
 	}
 
-	if (invite.userId !== user.id) {
+	if (invitation.userId !== user.id) {
 		throw new ApiError(meta.errors.noSuchInvitation);
 	}
 
-	await UserGroupInvites.delete(invite.id);
+	await UserGroupInvitations.delete(invitation.id);
 });

src/server/api/endpoints/users/groups/invite.ts

@@ -3,9 +3,10 @@ import { ID } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';
-import { UserGroups, UserGroupJoinings, UserGroupInvites } from '../../../../../models';
+import { UserGroups, UserGroupJoinings, UserGroupInvitations } from '../../../../../models';
 import { genId } from '../../../../../misc/gen-id';
-import { UserGroupInvite } from '../../../../../models/entities/user-group-invite';
+import { UserGroupInvitation } from '../../../../../models/entities/user-group-invitation';
+import { createNotification } from '../../../../../services/create-notification';
 
 export const meta = {
 	desc: {
@@ -86,19 +87,24 @@ export default define(meta, async (ps, me) => {
 		throw new ApiError(meta.errors.alreadyAdded);
 	}
 
-	const invite = await UserGroupInvites.findOne({
+	const existInvitation = await UserGroupInvitations.findOne({
 		userGroupId: userGroup.id,
 		userId: user.id
 	});
 
-	if (invite) {
+	if (existInvitation) {
 		throw new ApiError(meta.errors.alreadyInvited);
 	}
 
-	await UserGroupInvites.save({
+	const invitation = await UserGroupInvitations.save({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
 		userGroupId: userGroup.id
-	} as UserGroupInvite);
+	} as UserGroupInvitation);
+
+	// 通知を作成
+	createNotification(user.id, me.id, 'groupInvited', {
+		userGroupInvitationId: invitation.id
+	});
 });

src/server/web/index.ts

@@ -327,6 +327,10 @@ const override = (source: string, target: string, depth: number = 0) =>
 router.get('/othello', async ctx => ctx.redirect(override(ctx.URL.pathname, 'games/reversi', 1)));
 router.get('/reversi', async ctx => ctx.redirect(override(ctx.URL.pathname, 'games')));
 
+router.get('/flush', async ctx => {
+	await ctx.render('flush');
+});
+
 // Render base html for all requests
 router.get('*', async ctx => {
 	const meta = await fetchMeta();