11.32.0

Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Update dependencies 🚀
2019-09-10 15:48:37 +09:00 · 2019-09-10 15:46:20 +09:00 · 2019-09-10 15:46:00 +09:00 · 2019-09-10 15:44:25 +09:00 · 2019-09-09 22:47:52 +09:00 · 2019-09-09 22:46:45 +09:00
33 changed files with 417 additions and 260 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 ChangeLog
 =========

+11.32.0 (2019/09/10)
+--------------------
+### ✨Improvements
+* APでRenote/Boost取り消しをやりとりするように
+* リモートNote存在確認から作成までの間にLockをかけるように
+* 広告ブロッカーの警告を削除
+
+### 🐛Fixes
+* ミュートしているユーザーからトークメッセージが来たときに通知インジケーターが点灯する問題を修正
+* リアクションした人が10人を超えるときツールチップの表示がおかしい問題を修正
+
+11.31.4 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
 11.31.3 (2019/09/03)
 --------------------
 ### 🐛Fixes
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -270,3 +270,7 @@ npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```

 作成されたスクリプトは不必要な変更を含むため除去してください。
+
+## その他
+### HTMLのクラス名で follow という単語は使わない
+広告ブロッカーで誤ってブロックされる
--- a/README.md
+++ b/README.md
@@ -104,6 +104,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <!-- PATREON_START -->
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20010324/b8af4bd31ae34fbf8806cc0e6228e400/1.png?token-time=2145916800&token-hash=iyiocfousNIUwASmatsIDq8EOsmLUdrQNkWyktHlmJg%3D" alt="Nemo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
@@ -111,6 +112,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
+<td><a href="https://www.patreon.com/user?u=20010324">Nemo</a></td>
 <td><a href="https://www.patreon.com/weepjp">weepjp</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
@@ -121,30 +123,34 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/osapon">osapon</a></td>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17195955/be45e5e14c3e48b2bee0456c84e19df4/4.jpe?token-time=2145916800&token-hash=UslrPVM-8TXOe8AapuNiaFYjcIJgPNcU-fKpGbfGJNI%3D" alt="Damillora" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
 <td><a href="https://www.patreon.com/takimura">takimura</a></td>
+<td><a href="https://www.patreon.com/damillora">Damillora</a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
 <td><a href="https://www.patreon.com/noellabo">noellabo</a></td>
@@ -165,7 +171,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Sun, 01 Sep 2019 22:11:05 UTC
+**Last updated:** Sat, 07 Sep 2019 13:23:36 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -18,9 +18,6 @@ common:
    drive: "Disk"
    drive-desc: "Chcete sdílet obrázek, který jste již nahráli? Chcete vaše nahrané soubory organizovat, pojmenovávat a vytvářet pro ně složky? Misskey Disk je pro vás nejlepší řešení. Je velmi snadné sdílet vaše soubory online."
    outro: "Podívejte se na unikátní vlastnosti Misskey vlastníma očima! Pokud si myslíte, že tato instance není pro vás, zkuste jiné instance, neboť Misskey je decentralizovaná sociální síť, takže můžete snadno najít své přátele. Hodně štěstí a zábavy!"
-  adblock:
-    detected: "Prosím vypněte svůj blokovač reklam"
-    warning: "Některé vlastnosti mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam. <strong>Misskey nepoužívá reklamy</strong>."
  application-authorization: "Autorizované aplikace"
  close: "Zavřít"
  do-not-copy-paste: "Prosím nezadávejte ani nevkládejte sem kód. Váš účet může být kompromitován."
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drev"
    drive-desc: "Vil du poste et billede, som du tidligere har uploadet? Har du brug for at navngive filer og organisere dem i mapper, som du selv har navngivet? Så er Misskey Drev den bedste løsning for dig. Den gør det så let som ingenting at dele dine filer online."
    outro: "Tjek Misskey's unikke funktioner ved at se dem med dine egne øjne. Hvis du kommer frem til, at den ene server ikke er noget for dig, så kan du prøve en anden. Misskey er et decentraliseret SNS, så du kan lettere finde frem til brugere, som du klikker med. God fornøjelse!"
-  adblock:
-    detected: "Her kan du deaktivere ad blocker."
-    warning: "Visse funktioner kan forsvinde eller medføre forstyrrelser, hvis ad blocking er aktiveret. <strong>Misskey kører ikke annoncer</strong>."
  application-authorization: "Adgangsstyring"
  close: "Luk"
  do-not-copy-paste: "Undgå venligst at skrive eller klistre kode ind her. I modsat fald kan din konto blive kompromitteret."
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
    outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
-  adblock:
-    detected: "Bitte deaktiviere den Werbeblocker."
-    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
  application-authorization: "Autorisierte Anwendungen"
  close: "Schließen"
  do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
    outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
-  adblock:
-    detected: "Please disable ad blocker."
-    warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
  application-authorization: "Application authorizations"
  close: "Close"
  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
@@ -1822,6 +1819,8 @@ pages:
  page-created: "Created the page!"
  page-updated: "Updated the page"
  name-already-exists: "The specified page name already exists"
+  title-invalid-name: "The specified page URL is invalid"
+  text-invalid-name: "Check whether that is not a blank"
  are-you-sure-delete: "Do you want to delete this page?"
  page-deleted: "The page has been deleted"
  edit-this-page: "Edit this page"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -16,9 +16,6 @@ common:
    ui: "Interfaz"
    ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
    drive: "Drive"
-  adblock:
-    detected: "Por favor, desactive el bloqueador de publicidad."
-    warning: "<strong>Misskey no tiene anuncios publicitarios.</strong> Sin embargo, algunas características podrían no estar disponibles si el bloqueador de publicidad está habilitado."
  application-authorization: "Autorizaciones de la aplicación."
  close: "Cerrar"
  do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Vous voulez poster une photo que vous avez déjà transférée ? Vous souhaitez organiser, nommer et créer un dossier pour vos fichiers téléversés ? Misskey Drive est la meilleure solution pour vous. Très facile de partager vos fichiers en ligne."
    outro: "Découvrez vous-même les fonctionnalités de Misskey. Étant donné que Misskey est un réseau social fédéré, vous pouvez essayer d’autres instances afin de trouver vos amis si la présente instance ne vous correspond pas. Bonne chance et amusez-vous bien !"
-  adblock:
-    detected: "Veuillez désactiver votre bloqueur de publicités"
-    warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
  application-authorization: "Autorisations de l’application"
  close: "Fermer"
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte pourrait être compromis."
@@ -37,17 +34,17 @@ common:
  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
  delete-confirm: "Supprimer cette publication ?"
  signin-required: "Veuillez vous connecter"
-  notification-type: "Type de notification"
+  notification-type: "Type de notifications"
  notification-types:
    all: "Tout"
-    pollVote: "Sondage"
+    pollVote: "Sondages"
    follow: "Abonnements"
    receiveFollowRequest: "Demandes d’abonnements"
-    reply: "Répondre"
+    reply: "Réponses"
    quote: "Cité par"
-    renote: "Republier"
+    renote: "Partages"
    mention: "Mentions"
-    reaction: "Réaction"
+    reaction: "Réactions"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@@ -183,7 +180,7 @@ common:
    notification: "Notifications"
    apps: "Applications"
    tags: "Hashtags"
-    mute-and-block: "Silencés / Bloqués"
+    mute-and-block: "Masqués / Bloqués"
    blocking: "En cours blocage"
    security: "Sécurité"
    signin: "Historique des connexions"
@@ -199,6 +196,7 @@ common:
    web-search-engine: "Moteur de recherche Web"
    web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
    paste: "Coller"
+    pasted-file-name-desc: "Exemple : \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
    keep-cw: "Maintenir l'avertissement de contenu"
    keep-cw-desc: "Lorsque vous répondez à un message, le même avertissement de contenu est reprit par défaut dans la réponse, le même que celui qui a été défini dans le message original."
    i-like-sushi: "Je préfère les sushis plutôt que le pudding"
@@ -380,6 +378,8 @@ common/views/pages/explore.vue:
  federated: "Du Fédiverse"
  explore: "Explorer {host}"
  users-info: "Actuellement, {users} utilisateur·rice·s se sont inscrit ici"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} ont réagit avec {reaction}"
 common/views/components/url-preview.vue:
  enable-player: "Activer la lecture"
  disable-player: "Fermer le lecteur"
@@ -545,8 +545,9 @@ common/views/components/note-menu.vue:
  unpin: "Désépingler"
  delete: "Supprimer"
  delete-confirm: "Supprimer cette publication ?"
-  delete-and-edit: "Effacer et éditer"
+  delete-and-edit: "Supprimer et réécrire"
  remote: "Afficher la note originale"
+  pin-limit-exceeded: "Vous ne pouvez plus épingler davantage de publications."
 common/views/components/user-menu.vue:
  mention: "Mention"
  mute: "Silencier"
@@ -600,7 +601,7 @@ common/views/components/poll-editor.vue:
  hour: "Heures"
  day: "D"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choisissez votre réaction"
+  choose-reaction: "Envoyer une réaction"
  input-reaction-placeholder: "ou insérez un émoji"
 common/views/components/emoji-picker.vue:
  custom-emoji: "Émoji personnalisé"
@@ -978,8 +979,8 @@ desktop/views/components/note-detail.vue:
  deleted: "cette publication a été supprimée"
  location: "Géolocalisation"
  renote: "Republier"
-  add-reaction: "Ajouter votre reaction"
-  undo-reaction: "Inverser la réaction"
+  add-reaction: "Ajouter une réaction"
+  undo-reaction: "Annuler la réaction"
 desktop/views/components/note.vue:
  reply: "Répondre"
  renote: "Partager"
@@ -1075,9 +1076,9 @@ common/views/components/drive-settings.vue:
  default-upload-folder-name: "Dossier·s"
  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "Silencés / Bloqués"
-  mute: "Mettre en sourdine"
-  block: "En cours blocage"
+  mute-and-block: "Masqués / Bloqués"
+  mute: "Mis en sourdine"
+  block: "Vous avez bloqué"
  no-muted-users: "Aucun utilisateur n’est mis en sourdine"
  no-blocked-users: "Aucun utilisateur n’est bloqué"
  word-mute: "Filtre de mots"
@@ -1775,6 +1776,8 @@ pages:
  read-page: "Voir la source"
  page-created: "Page a été créée !"
  page-updated: "A mis à jour la page"
+  name-already-exists: "Une page portant le même nom existe déjà"
+  title-invalid-name: "L’URL de la page spécifiée n’est pas valide"
  are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
  page-deleted: "La page a bien été supprimée."
  edit-this-page: "Éditer cette page"
@@ -1783,6 +1786,7 @@ pages:
  view-source: "Afficher la source"
  view-page: "Afficher la page"
  like: "Bien"
+  unlike: "Je n’aime pas"
  liked-pages: "Pages favorites"
  my-pages: "Mes pages"
  inspector: "Inspecteur"
@@ -2047,6 +2051,7 @@ room:
    book: "Livre"
    book2: "Livre 2"
    piano: "Piano"
+    facial-tissue: "Mouchoirs en papier"
    server: "Serveurs"
    moon: "Lune"
    corkboard: "Tableau en liège"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -19,9 +19,6 @@ common:
    drive: "ドライブ"
    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
-  adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
  application-authorization: "アプリの連携"
  close: "閉じる"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -18,9 +18,6 @@ common:
    drive: "ドライブ"
    drive-desc: "「こないだの画像、どこやったかな……また投稿したいんやけど……」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
    outro: "Misskeyの機能は無限大や！知らんけど。知らん言うとるやんけ、あんたが見に行けや！Misskeyは分散型SNSやから、ここがあかんくても他がある。阪神でもオリックスでもワイは応援するで！"
-  adblock:
-    detected: "広告ブロッカーを無効にしてや"
-    warning: "<strong>Misskeyは広告を掲載してへん</strong>けど、広告をブロックしはる機能がおると一部の機能が利用できんくなったり、不具合が発生するかも分からん。知らんけど。"
  application-authorization: "アプリの連携"
  close: "さいなら"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -18,9 +18,6 @@ common:
    drive: "드라이브"
    drive-desc: "이전에 올렸던 적 있는 이미지를 다시 올리고 싶을 때가 있지 않으신가요? 아니면 업로드했던 파일을 폴더로 정리하고 싶지 않으신가요? Misskey에 기본적으로 내장된 드라이브 기능으로 해결됩니다. 파일 공유도 쉽습니다."
    outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
-  adblock:
-    detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
  application-authorization: "앱 연계"
  close: "닫기"
  do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@@ -1822,6 +1819,8 @@ pages:
  page-created: "페이지를 만들었습니다"
  page-updated: "페이지를 수정했습니다"
  name-already-exists: "지정한 페이지 URL은 이미 존재합니다"
+  title-invalid-name: "유효하지 않은 페이지 URL입니다"
+  text-invalid-name: "비어있지 않은지 확인해주세요"
  are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
  page-deleted: "페이지가 삭제되었습니다"
  edit-this-page: "이 페이지를 편집"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -14,9 +14,6 @@ common:
    ui: "Interfejs"
    drive: "Dysk"
    drive-desc: "Chcesz opublikować zdjęcie, które już przesłałeś? Chcesz uporządkować, nazwać i utworzyć folder dla przesłanych plików? Dysk Misskey to najlepsze rozwiązanie dla Ciebie. Bardzo łatwo udostępniać swoje pliki online."
-  adblock:
-    detected: "Spróbuj wyłączyć blokadę reklam."
-    warning: "<strong>Misskey nie zawiera reklam</strong>, ale część funkcji może nie działać prawidłowo z włączonym blokowaniem reklam."
  application-authorization: "Współpraca aplikacji"
  close: "Zamknij"
  load-more: "Załaduj więcej"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -12,9 +12,7 @@ common:
    rich-contents: "Post"
    rich-contents-desc: "Apenas poste suas ideias, temas do momento e qualquer coisa que você queira compartilhar. Você pode querer decorar suas palavras, anexar suas imagens favoritas, enviar arquivos, inclusive vídeos ou criar uma enquete. Essas são as coisas que você pode fazer em Misskey."
    reaction: "Reações"
-  adblock:
-    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
+    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません"
  application-authorization: "Aplicativos autorizados"
  close: "Fechar"
  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -18,9 +18,6 @@ common:
    drive: "Хранилище файлов"
    drive-desc: "Хотите запостить картинку, которую уже отправляли ранее? Хочется сортировать, переименовать и создать папку для ваших выложенных файлов? Тогда Misskey Drive - это лучшее решение для вас. Очень лёгкий способ делиться своими файлами онлайн."
    outro: "Попробуйте будущие, уникальные для Misskey функции своими глазами! Если чувствуете, что это не в вашем вкусе, то попробуйте другие инстанции, ведь Misskey - это децентрализованная социальная сеть, так что ты можешь с лёгкостью найти себе товарищей. И наконец, GLHF!"
-  adblock:
-    detected: "Пожалуйста, отключите блокировщик рекламы."
-    warning: "Некоторые функции перестанут быть доступными или будут работать неправильно, если включена блокировка рекламы. <strong>В Misskey нет рекламы</strong>."
  application-authorization: "Авторизация приложений"
  close: "Закрыть"
  do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -18,9 +18,6 @@ common:
    drive: "网盘"
    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的网盘是一个最好的解决方案。"
    outro: "Misskey还有其他更多功能，请亲身体验一下吧。因为 Misskey 是一个分布式的 SNS，如果您感觉某个功能不适合自己，试试其他的吧。祝您玩得开心！"
-  adblock:
-    detected: "请关闭广告拦截器"
-    warning: "<strong>Misskey不会发布广告</strong>如果您启用广告拦截器, 可能会导致某些功能无法正常使用。"
  application-authorization: "应用程序授权"
  close: "关闭"
  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
@@ -1822,6 +1819,8 @@ pages:
  page-created: "页面已创建"
  page-updated: "页面已更新"
  name-already-exists: "该页面URL已存在"
+  title-invalid-name: "无效的页面URL"
+  text-invalid-name: "请确认该项不为空"
  are-you-sure-delete: "是否删除此页面？"
  page-deleted: "该页面已被删除。"
  edit-this-page: "编辑此页面"
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -7,8 +7,6 @@ common:
    rich-contents: "發佈"
    reaction: "回應"
    drive: "雲端硬碟"
-  adblock:
-    detected: "請禁用廣告封鎖器"
  close: "關閉"
  enter-password: "請輸入密碼"
  2fa: "雙重身份驗證"
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.31.3",
+	"version": "11.32.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -100,11 +100,11 @@
 		"@typescript-eslint/parser": "1.11.0",
 		"agentkeepalive": "4.0.2",
 		"animejs": "3.1.0",
-		"apexcharts": "3.8.5",
+		"apexcharts": "3.8.6",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.520.0",
+		"aws-sdk": "2.525.0",
 		"bcryptjs": "2.4.3",
 		"bootstrap": "4.3.1",
 		"bootstrap-vue": "2.0.0-rc.13",
@@ -120,7 +120,7 @@
 		"css-loader": "3.2.0",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
-		"deep-equal": "1.0.1",
+		"deep-equal": "1.1.0",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"emojilib": "2.4.0",
@@ -128,9 +128,8 @@
 		"eslint-plugin-vue": "5.2.3",
 		"eventemitter3": "4.0.0",
 		"feed": "3.0.0",
-		"file-type": "12.2.0",
+		"file-type": "12.3.0",
 		"fluent-ffmpeg": "2.1.2",
-		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
 		"gulp-imagemin": "6.1.0",
@@ -167,7 +166,7 @@
 		"koa-router": "7.4.0",
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.2.0",
+		"koa-views": "6.2.1",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
 		"lolex": "4.2.0",
@@ -200,6 +199,7 @@
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.2.0",
 		"redis": "2.8.0",
+		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"request": "2.88.0",
@@ -222,7 +222,7 @@
 		"syslog-pro": "1.0.0",
 		"systeminformation": "4.14.8",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.4.1",
+		"terser-webpack-plugin": "2.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.108.0",
 		"tinycolor2": "1.4.1",
@@ -245,14 +245,14 @@
 		"vue-cropperjs": "4.0.0",
 		"vue-i18n": "8.14.0",
 		"vue-js-modal": "1.3.31",
-		"vue-json-pretty": "1.6.1",
+		"vue-json-pretty": "1.6.2",
 		"vue-loader": "15.7.1",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.1.2",
+		"vue-router": "3.1.3",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.17",
+		"vue-svg-inline-loader": "1.2.18",
 		"vue-template-compiler": "2.6.10",
 		"vuedraggable": "2.23.0",
 		"vuewordcloud": "18.7.11",
@@ -260,7 +260,7 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.5",
 		"webpack": "4.39.3",
-		"webpack-cli": "3.3.7",
+		"webpack-cli": "3.3.8",
 		"websocket": "1.0.29",
 		"ws": "7.1.2",
 		"xev": "2.0.1"
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@@ -1,18 +0,0 @@
-declare const fuckAdBlock: any;
-
-export default ($root: any) => {
-	require('fuckadblock');
-
-	function adBlockDetected() {
-		$root.dialog({
-			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning')
-		});
-	}
-
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};
--- a/src/client/app/common/views/components/reactions-viewer.details.vue
+++ b/src/client/app/common/views/components/reactions-viewer.details.vue
@@ -1,22 +1,27 @@
 <template>
-	<transition name="zoom-in-top">
-		<div class="buebdbiu" ref="popover" v-if="show">
-			<i18n path="few-users" v-if="users.length <= 10">
-				<span slot="users">
-					<b v-for="u in users" :key="u.id" style="margin-right: 8px;">
-						<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
-						<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
-					</b>
-				</span>
-				<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
-			</i18n>
-			<i18n path="many-users" v-if="10 < users.length">
-				<span slot="users">{{ users.slice(0, 10).join(', ') }}</span>
-				<span slot="ommited">{{ count - 10 }}</span>
-				<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
-			</i18n>
-		</div>
-	</transition>
+<transition name="zoom-in-top">
+	<div class="buebdbiu" ref="popover" v-if="show">
+		<i18n path="few-users" v-if="users.length <= 10">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+		<i18n path="many-users" v-if="10 < users.length">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<span slot="omitted">{{ count - 10 }}</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+	</div>
+</transition>
 </template>

 <script lang="ts">
@@ -82,7 +87,7 @@ export default Vue.extend({
 	position absolute
 	max-width 240px
 	font-size 0.8em
-	padding 5px 8px
+	padding 6px 8px
 	background $bgcolor
 	text-align center
 	color var(--text)
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -18,7 +18,7 @@
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
 				</div>
-				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
+				<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
 		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
@@ -134,7 +134,7 @@ export default Vue.extend({
 				font-size 14px
 				padding-right 40px

-			> .follow-button
+			> .koudoku-button
 				position absolute
 				top 8px
 				right 0
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -9,7 +9,6 @@ import VueRouter from 'vue-router';
 import './style.styl';

 import init from '../init';
-import fuckAdBlock from '../common/scripts/fuck-ad-block';
 import composeNotification from '../common/scripts/compose-notification';

 import MkHome from './views/home/home.vue';
@@ -203,13 +202,6 @@ init(async (launch, os) => {
 	// Launch the app
 	const [app, _] = launch(router);

-	if (os.store.getters.isSignedIn) {
-		/**
-		 * Fuck AD Block
-		 */
-		fuckAdBlock(app);
-	}
-
 	/**
 	 * Init Notification
 	 */
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -21,7 +21,7 @@
 				<p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span>
 			</div>
 		</div>
-		<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
+		<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
 	</template>
 </div>
 </template>
@@ -156,7 +156,7 @@ export default Vue.extend({
 				font-size 1em
 				color var(--primary)

-	> .follow-button
+	> .koudoku-button
 		position absolute
 		top 8px
 		right 8px
--- a/src/misc/app-lock.ts
+++ b/src/misc/app-lock.ts
@@ -0,0 +1,22 @@
+import redis from '../db/redis';
+import { promisify } from 'util';
+
+/**
+ * Retry delay (ms) for lock acquisition
+ */
+const retryDelay = 100;
+
+const lock: (key: string, timeout?: number) => Promise<() => void>
+	= redis
+	? promisify(require('redis-lock')(redis, retryDelay))
+	: async () => () => { };
+
+/**
+ * Get AP Object lock
+ * @param uri AP object ID
+ * @param timeout Lock timeout (ms), The timeout releases previous lock.
+ * @returns Unlock function
+ */
+export function getApLock(uri: string, timeout = 30 * 1000) {
+	return lock(`ap-object:${uri}`, timeout);
+}
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import { EntityRepository, Repository, In } from 'typeorm';
+import { EntityRepository, Repository, In, Not } from 'typeorm';
 import { User, ILocalUser, IRemoteUser } from '../entities/user';
 import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages } from '..';
 import { ensure } from '../../prelude/ensure';
@@ -56,6 +56,10 @@ export class UserRepository extends Repository<User> {
 	}

 	public async getHasUnreadMessagingMessage(userId: User['id']): Promise<boolean> {
+		const mute = await Mutings.find({
+			muterId: userId
+		});
+
 		const joinings = await UserGroupJoinings.find({ userId: userId });

 		const groupQs = Promise.all(joinings.map(j => MessagingMessages.createQueryBuilder('message')
@@ -66,11 +70,11 @@ export class UserRepository extends Repository<User> {
 			.getOne().then(x => x != null)));

 		const [withUser, withGroups] = await Promise.all([
-			// TODO: ミュートを考慮
 			MessagingMessages.count({
 				where: {
 					recipientId: userId,
-					isRead: false
+					isRead: false,
+					...(mute.length > 0 ? { userId: Not(In(mute.map(x => x.muteeId))) } : {}),
 				},
 				take: 1
 			}).then(count => count > 0),
--- a/src/remote/activitypub/kernel/announce/note.ts
+++ b/src/remote/activitypub/kernel/announce/note.ts
@@ -7,6 +7,7 @@ import { resolvePerson } from '../../models/person';
 import { apLogger } from '../../logger';
 import { extractDbHost } from '../../../../misc/convert-host';
 import { fetchMeta } from '../../../../misc/fetch-meta';
+import { getApLock } from '../../../../misc/app-lock';

 const logger = apLogger;

@@ -25,47 +26,53 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
 	const meta = await fetchMeta();
 	if (meta.blockedHosts.includes(extractDbHost(uri))) return;

-	// 既に同じURIを持つものが登録されていないかチェック
-	const exist = await fetchNote(uri);
-	if (exist) {
-		return;
-	}
+	const unlock = await getApLock(uri);

-	// Announce対象をresolve
-	let renote;
 	try {
-		renote = await resolveNote(note);
-	} catch (e) {
-		// 対象が4xxならスキップ
-		if (e.statusCode >= 400 && e.statusCode < 500) {
-			logger.warn(`Ignored announce target ${note.inReplyTo} - ${e.statusCode}`);
+		// 既に同じURIを持つものが登録されていないかチェック
+		const exist = await fetchNote(uri);
+		if (exist) {
 			return;
 		}
-		logger.warn(`Error in announce target ${note.inReplyTo} - ${e.statusCode || e}`);
-		throw e;
+
+		// Announce対象をresolve
+		let renote;
+		try {
+			renote = await resolveNote(note);
+		} catch (e) {
+			// 対象が4xxならスキップ
+			if (e.statusCode >= 400 && e.statusCode < 500) {
+				logger.warn(`Ignored announce target ${note.inReplyTo} - ${e.statusCode}`);
+				return;
+			}
+			logger.warn(`Error in announce target ${note.inReplyTo} - ${e.statusCode || e}`);
+			throw e;
+		}
+
+		logger.info(`Creating the (Re)Note: ${uri}`);
+
+		//#region Visibility
+		const to = getApIds(activity.to);
+		const cc = getApIds(activity.cc);
+
+		const visibility = getVisibility(to, cc, actor);
+
+		let visibleUsers: User[] = [];
+		if (visibility == 'specified') {
+			visibleUsers = await Promise.all(to.map(uri => resolvePerson(uri)));
+		}
+		//#endergion
+
+		await post(actor, {
+			createdAt: activity.published ? new Date(activity.published) : null,
+			renote,
+			visibility,
+			visibleUsers,
+			uri
+		});
+	} finally {
+		unlock();
 	}
-
-	logger.info(`Creating the (Re)Note: ${uri}`);
-
-	//#region Visibility
-	const to = getApIds(activity.to);
-	const cc = getApIds(activity.cc);
-
-	const visibility = getVisibility(to, cc, actor);
-
-	let visibleUsers: User[] = [];
-	if (visibility == 'specified') {
-		visibleUsers = await Promise.all(to.map(uri => resolvePerson(uri)));
-	}
-	//#endergion
-
-	await post(actor, {
-		createdAt: activity.published ? new Date(activity.published) : null,
-		renote,
-		visibility,
-		visibleUsers,
-		uri
-	});
 }

 type visibility = 'public' | 'home' | 'followers' | 'specified';
--- a/src/remote/activitypub/kernel/create/note.ts
+++ b/src/remote/activitypub/kernel/create/note.ts
@@ -1,13 +1,23 @@
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/entities/user';
 import { createNote, fetchNote } from '../../models/note';
+import { getApId } from '../../type';
+import { getApLock } from '../../../../misc/app-lock';

 /**
 * 投稿作成アクティビティを捌きます
 */
 export default async function(resolver: Resolver, actor: IRemoteUser, note: any, silent = false): Promise<void> {
-	const exist = await fetchNote(note);
-	if (exist == null) {
-		await createNote(note);
+	const uri = getApId(note);
+
+	const unlock = await getApLock(uri);
+
+	try {
+		const exist = await fetchNote(note);
+		if (exist == null) {
+			await createNote(note);
+		}
+	} finally {
+		unlock();
 	}
 }
--- a/src/remote/activitypub/kernel/undo/announce.ts
+++ b/src/remote/activitypub/kernel/undo/announce.ts
@@ -0,0 +1,16 @@
+import { Notes } from '../../../../models';
+import { IRemoteUser } from '../../../../models/entities/user';
+import { IAnnounce, getApId } from '../../type';
+import deleteNote from '../../../../services/note/delete';
+
+export const undoAnnounce = async (actor: IRemoteUser, activity: IAnnounce): Promise<void> => {
+	const uri = getApId(activity);
+
+	const note = await Notes.findOne({
+		uri
+	});
+
+	if (!note) return;
+
+	await deleteNote(actor, note);
+};
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -1,8 +1,9 @@
 import { IRemoteUser } from '../../../../models/entities/user';
-import { IUndo, IFollow, IBlock, ILike } from '../../type';
+import { IUndo, IFollow, IBlock, ILike, IAnnounce } from '../../type';
 import unfollow from './follow';
 import unblock from './block';
 import undoLike from './like';
+import { undoAnnounce } from './announce';
 import Resolver from '../../resolver';
 import { apLogger } from '../../logger';

@@ -38,5 +39,8 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 		case 'Like':
 			undoLike(actor, object as ILike);
 			break;
+		case 'Announce':
+			undoAnnounce(actor, object as IAnnounce);
+			break;
 	}
 };
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -22,6 +22,7 @@ import { Emoji } from '../../../models/entities/emoji';
 import { genId } from '../../../misc/gen-id';
 import { fetchMeta } from '../../../misc/fetch-meta';
 import { ensure } from '../../../prelude/ensure';
+import { getApLock } from '../../../misc/app-lock';

 const logger = apLogger;

@@ -257,30 +258,24 @@ export async function resolveNote(value: string | IObject, resolver?: Resolver):
 	const meta = await fetchMeta();
 	if (meta.blockedHosts.includes(extractDbHost(uri))) throw { statusCode: 451 };

-	//#region このサーバーに既に登録されていたらそれを返す
-	const exist = await fetchNote(uri);
+	const unlock = await getApLock(uri);

-	if (exist) {
-		return exist;
-	}
-	//#endregion
+	try {
+		//#region このサーバーに既に登録されていたらそれを返す
+		const exist = await fetchNote(uri);

-	// リモートサーバーからフェッチしてきて登録
-	// ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが
-	// 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。
-	return await createNote(uri, resolver, true).catch(e => {
-		if (e.name === 'duplicated') {
-			return fetchNote(uri).then(note => {
-				if (note == null) {
-					throw new Error('something happened');
-				} else {
-					return note;
-				}
-			});
-		} else {
-			throw e;
+		if (exist) {
+			return exist;
 		}
-	});
+		//#endregion
+
+		// リモートサーバーからフェッチしてきて登録
+		// ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが
+		// 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。
+		return await createNote(uri, resolver, true);
+	} finally {
+		unlock();
+	}
 }

 export async function extractEmojis(tags: ITag[], host: string): Promise<Emoji[]> {
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -195,10 +195,7 @@ export default define(meta, async (ps, user) => {
 			const mute = await Mutings.find({
 				muterId: recipientUser.id,
 			});
-			const mutedUserIds = mute.map(m => m.muteeId.toString());
-			if (mutedUserIds.indexOf(user.id) != -1) {
-				return;
-			}
+			if (mute.map(m => m.muteeId).includes(user.id)) return;
 			//#endregion

 			publishMainStream(recipientUser.id, 'unreadMessagingMessage', messageObj);
--- a/src/services/note/delete.ts
+++ b/src/services/note/delete.ts
@@ -1,5 +1,7 @@
 import { publishNoteStream } from '../stream';
 import renderDelete from '../../remote/activitypub/renderer/delete';
+import renderAnnounce from '../../remote/activitypub/renderer/announce';
+import renderUndo from '../../remote/activitypub/renderer/undo';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
 import renderTombstone from '../../remote/activitypub/renderer/tombstone';
@@ -35,7 +37,17 @@ export default async function(user: User, note: Note, quiet = false) {

 		//#region ローカルの投稿なら削除アクティビティを配送
 		if (Users.isLocalUser(user)) {
-			const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note.id}`), user));
+			let renote: Note | undefined;
+
+			if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length == 0)) {
+				renote = await Notes.findOne({
+					id: note.renoteId
+				});
+			}
+
+			const content = renderActivity(renote
+				? renderUndo(renderAnnounce(renote.uri || `${config.url}/notes/${renote.id}`, note), user)
+				: renderDelete(renderTombstone(`${config.url}/notes/${note.id}`), user));

 			const queue: string[] = [];

--- a/yarn.lock
+++ b/yarn.lock
@@ -1218,10 +1218,10 @@ anymatch@^2.0.0:
    micromatch "^3.1.4"
    normalize-path "^2.1.1"

-apexcharts@3.8.5:
-  version "3.8.5"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.8.5.tgz#51b403b4e5f9e3bdaf6e2387f3bfbca55d752429"
-  integrity sha512-sEAcxA5aT1T/Tj6+CE4DXBYQNB5AcqUMB6S6dFsoqxQKppxyKQnNWX6HvqiCPA2ExYBBfrcNzEpKj+XaIeXONg==
+apexcharts@3.8.6:
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.8.6.tgz#d32b1cb0480351dd7ed79e45722d5ea604f89009"
+  integrity sha512-IFw0MgShaW/HgOS/MnaaZa8rgIAwk89XvmOV6SRFkGjfQZIlQFzPDgrnKMbjsRqo2J8DBbdzSYejwvOFiJpkSg==
  dependencies:
    promise-polyfill "8.1.0"
    svg.draggable.js "^2.2.2"
@@ -1549,10 +1549,10 @@ autwh@0.1.0:
  dependencies:
    oauth "0.9.15"

-aws-sdk@2.520.0:
-  version "2.520.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.520.0.tgz#6d3ff7784617b477f283857e49667d190d51a550"
-  integrity sha512-I0BnCLyoqJ17bW48LYMpBcyhSpMW+c+H0GPnFoB7T8Xi2uype3sNV+4qzmHMVhVYv+2Xba9CMenyiH6qeYSwvQ==
+aws-sdk@2.525.0:
+  version "2.525.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.525.0.tgz#220da4ff859947bac9b2d391cae5a459fef3989e"
+  integrity sha512-UgigVfY4ayrffOMbybyz3F1bbIpEhuiO4yfYXultBC1LfIhZaFSFWLqzEBnm9srhydJhfLDftkL0WXVJtfJ4ng==
  dependencies:
    buffer "4.9.1"
    events "1.1.1"
@@ -1738,7 +1738,7 @@ bl@^1.0.0:
    readable-stream "^2.3.5"
    safe-buffer "^5.1.1"

-bluebird@^3.1.1, bluebird@^3.4.1, bluebird@^3.5.1:
+bluebird@^3.1.1, bluebird@^3.4.1:
  version "3.5.4"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
@@ -1999,7 +1999,7 @@ bytes@3.1.0, bytes@^3.0.0, bytes@^3.1.0:
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==

-cacache@^12.0.2:
+cacache@^12.0.2, cacache@^12.0.3:
  version "12.0.3"
  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
@@ -2707,7 +2707,7 @@ console-stream@^0.1.1:
  resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
  integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=

-consolidate@^0.15.0, consolidate@^0.15.1:
+consolidate@0.15.1, consolidate@^0.15.1:
  version "0.15.1"
  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
@@ -3329,7 +3329,19 @@ deep-eql@^3.0.1:
  dependencies:
    type-detect "^4.0.0"

-deep-equal@1.0.1, deep-equal@~1.0.1:
+deep-equal@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
+  integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
+
+deep-equal@~1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
@@ -4259,10 +4271,10 @@ file-entry-cache@^5.0.1:
  dependencies:
    flat-cache "^2.0.1"

-file-type@12.2.0, file-type@^12.0.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.2.0.tgz#bc4bce830e38a96a0ecfea0e2dfcee2855ed1380"
-  integrity sha512-bkDBeH5doAqP69axEO69OviLlWbrZ10Ne2OPHaxBgG+fyT0w/2zfMzJz21SPwq5Iq0aN70q7RN3KRcdUY427Mg==
+file-type@12.3.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.3.0.tgz#74d755e5dc9c5cbc7ee6f182529b453906ac88c2"
+  integrity sha512-4E4Esq9KLwjYCY32E7qSmd0h7LefcniZHX+XcdJ4Wfx1uGJX7QCigiqw/U0yT7WOslm28yhxl87DJ0wHYv0RAA==

 file-type@5.2.0, file-type@^5.2.0:
  version "5.2.0"
@@ -4274,6 +4286,11 @@ file-type@^10.4.0:
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
  integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==

+file-type@^12.0.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.2.0.tgz#bc4bce830e38a96a0ecfea0e2dfcee2855ed1380"
+  integrity sha512-bkDBeH5doAqP69axEO69OviLlWbrZ10Ne2OPHaxBgG+fyT0w/2zfMzJz21SPwq5Iq0aN70q7RN3KRcdUY427Mg==
+
 file-type@^3.8.0:
  version "3.9.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
@@ -4334,6 +4351,15 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
    make-dir "^2.0.0"
    pkg-dir "^3.0.0"

+find-cache-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
+  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.0"
+    pkg-dir "^4.1.0"
+
 find-up@3.0.0, find-up@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -4356,6 +4382,14 @@ find-up@^2.1.0:
  dependencies:
    locate-path "^2.0.0"

+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 find-versions@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.1.0.tgz#10161f29cf3eb4350dec10a29bdde75bff0df32d"
@@ -4507,15 +4541,6 @@ fs-constants@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

-fs-extra@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
  version "1.2.6"
  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
@@ -4554,11 +4579,6 @@ fsevents@^1.2.7:
    nan "^2.12.1"
    node-pre-gyp "^0.12.0"

-fuckadblock@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/fuckadblock/-/fuckadblock-3.2.1.tgz#17fa3237a5e15c86613406b911e608191a3e62e2"
-  integrity sha1-F/oyN6XhXIZhNAa5EeYIGRo+YuI=
-
 function-bind@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4598,13 +4618,12 @@ get-func-name@^2.0.0:
  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=

-get-paths@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/get-paths/-/get-paths-0.0.4.tgz#0a053ca424bab976383ce49929528ad642e2a0df"
-  integrity sha512-+AxlfMGN7FuJr2zhT6aErH08HMKkRwynTTHtWCenIWkIZgx2OlkZKgt7SM4+rh8Dfi32lo6HcvqeTLxph3kjQw==
+get-paths@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/get-paths/-/get-paths-0.0.7.tgz#15331086752077cf130166ccd233a1cdbeefcf38"
+  integrity sha512-0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==
  dependencies:
-    bluebird "^3.5.1"
-    fs-extra "^4.0.2"
+    pify "^4.0.1"

 get-port@^5.0.0:
  version "5.0.0"
@@ -5706,6 +5725,11 @@ is-accessor-descriptor@^1.0.0:
  dependencies:
    kind-of "^6.0.0"

+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
 is-arrayish@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6093,6 +6117,14 @@ isurl@^1.0.0-alpha5:
    has-to-string-tag-x "^1.2.0"
    is-object "^1.0.1"

+jest-worker@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^6.1.0"
+
 jmespath@0.15.0:
  version "0.15.0"
  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
@@ -6248,13 +6280,6 @@ json5@^1.0.1:
  dependencies:
    minimist "^1.2.0"

-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsprim@^1.2.2:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -6465,14 +6490,14 @@ koa-slow@2.1.0:
    lodash.isregexp "3.0.5"
    q "1.4.1"

-koa-views@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/koa-views/-/koa-views-6.2.0.tgz#6150d5cb47034514898e9e8aefe6d3acc1456b5c"
-  integrity sha512-Y1rCFd4I5uSjZg0r4Zzs4hDjYTSGHhdBM5DuEhccWzknWikwOfc2ph/DkrocKhtQfFbLPHkkz/Ox38AL+p99BA==
+koa-views@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/koa-views/-/koa-views-6.2.1.tgz#67638e754f9467fcb7ccd6ba601164cb5dadfea8"
+  integrity sha512-wU3tw48KuskaJg0x1JZmC73UWGgVmh6B54HuHDzTrkavig+dBI0NbFeGiWsaOCZREQkaTfIVXSPSByDant71ew==
  dependencies:
-    consolidate "^0.15.0"
+    consolidate "0.15.1"
    debug "^4.1.0"
-    get-paths "^0.0.4"
+    get-paths "0.0.7"
    koa-send "^5.0.0"
    mz "^2.4.0"
    pretty "^2.0.0"
@@ -6616,6 +6641,13 @@ locate-path@^3.0.0:
    p-locate "^3.0.0"
    path-exists "^3.0.0"

+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 lodash._baseassign@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -7130,6 +7162,11 @@ merge-source-map@^1.1.0:
  dependencies:
    source-map "^0.6.1"

+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge2@^1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
@@ -7752,7 +7789,12 @@ object-copy@^0.1.0:
    define-property "^0.2.5"
    kind-of "^3.0.3"

-object-keys@^1.0.11, object-keys@^1.0.12:
+object-is@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -8002,6 +8044,13 @@ p-limit@^2.0.0:
  dependencies:
    p-try "^2.0.0"

+p-limit@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -8016,6 +8065,13 @@ p-locate@^3.0.0:
  dependencies:
    p-limit "^2.0.0"

+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
 p-map-series@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
@@ -8200,6 +8256,11 @@ path-exists@^3.0.0:
  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=

+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -8359,6 +8420,13 @@ pkg-dir@^3.0.0:
  dependencies:
    find-up "^3.0.0"

+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 plugin-error@1.0.1, plugin-error@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
@@ -9566,6 +9634,11 @@ redis-errors@^1.0.0, redis-errors@^1.2.0:
  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=

+redis-lock@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/redis-lock/-/redis-lock-0.1.4.tgz#e83590bee22b5f01cdb65bfbd88d988045356272"
+  integrity sha512-7/+zu86XVQfJVx1nHTzux5reglDiyUCDwmW7TSlvVezfhH2YLc/Rc8NE0ejQG+8/0lwKzm29/u/4+ogKeLosiA==
+
 redis-parser@^2.6.0:
  version "2.6.0"
  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
@@ -9626,6 +9699,13 @@ regex-not@^1.0.0, regex-not@^1.0.2:
    extend-shallow "^3.0.2"
    safe-regex "^1.1.0"

+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  dependencies:
+    define-properties "^1.1.2"
+
 regexpp@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -10004,6 +10084,14 @@ schema-utils@^2.0.0:
    ajv "^6.1.0"
    ajv-keywords "^3.1.0"

+schema-utils@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz#48a065ce219e0cacf4631473159037b2c1ae82da"
+  integrity sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==
+  dependencies:
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
 scrollmonitor@^1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/scrollmonitor/-/scrollmonitor-1.2.4.tgz#823d04cc1574aa3b71de7cc70ef91ebe633344a0"
@@ -10080,6 +10168,11 @@ serialize-javascript@^1.7.0:
  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==

+serialize-javascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
+  integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -10900,7 +10993,21 @@ tempfile@^2.0.0:
    temp-dir "^1.0.0"
    uuid "^3.0.1"

-terser-webpack-plugin@1.4.1, terser-webpack-plugin@^1.4.1:
+terser-webpack-plugin@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.0.1.tgz#5e69a187133472174ef2fb51afc76a0f0a7b1d13"
+  integrity sha512-DXx8f7080P2dgW9Ydd7MUon81AL+GkGr9prfQRf+rH06dRrgCGIvtT7q73JRm2UzmjKeJGtro9O8zwL2y2udag==
+  dependencies:
+    cacache "^12.0.3"
+    find-cache-dir "^3.0.0"
+    jest-worker "^24.9.0"
+    schema-utils "^2.2.0"
+    serialize-javascript "^2.1.0"
+    source-map "^0.6.1"
+    terser "^4.2.1"
+    webpack-sources "^1.4.3"
+
+terser-webpack-plugin@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
@@ -10924,6 +11031,15 @@ terser@^4.1.2:
    source-map "~0.6.1"
    source-map-support "~0.5.12"

+terser@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
+  integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 text-table@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -11436,11 +11552,6 @@ unique-stream@^2.0.2:
    json-stable-stringify-without-jsonify "^1.0.1"
    through2-filter "^3.0.0"

-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 unpipe@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -11768,10 +11879,10 @@ vue-js-modal@1.3.31:
  resolved "https://registry.yarnpkg.com/vue-js-modal/-/vue-js-modal-1.3.31.tgz#fdece823d4f2816c8b1075c1fd8f667df11f5a42"
  integrity sha512-gwt2904sWbMUuUcHwKQ510IEs4G7S3bqVWLYeTOc2eEyWMmmnT9UmojDsXIexFnPVM7cZTua37z3Jm/h0i0y8Q==

-vue-json-pretty@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/vue-json-pretty/-/vue-json-pretty-1.6.1.tgz#b9961a99ee6620cb0b2b050be1c02c00e4ed66cc"
-  integrity sha512-XtNpgi/YE9V5Dbe1tQG7cozLjqhfnRtXWriYg16Hdj4GI1T8mW9tNAENFDVUD4sasJDREvWHS3cYc1UZPg121g==
+vue-json-pretty@1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/vue-json-pretty/-/vue-json-pretty-1.6.2.tgz#7fb1eb5e6536ed30ada757df129889d0249c5505"
+  integrity sha512-thZrceEBt9HqEX94/xnws5N/d165BIXbLY1VPeT2UyDP8jbGNC54+wzzJuLFF1teZLtTRfNOz8wf8bmuoJ/kRw==

 vue-loader@15.7.1:
  version "15.7.1"
@@ -11796,10 +11907,10 @@ vue-prism-component@1.1.1:
  resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.1.1.tgz#df0e375f7f9b367b069b2d54e6ed86facde96030"
  integrity sha512-M4wM7gMIagWgf3YNS5Hrq7YDYu0pYbqMaJOhkVDfCfJ1col4ZCv+uyWpW/gkYZCuG3ic8UF3EAV22asm4pWjMA==

-vue-router@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.2.tgz#2e0904703545dabdd42b2b7a2e617f02f99a1969"
-  integrity sha512-WssQEHSEvIS1/CI4CO2T8LJdoK4Q9Ngox28K7FDNMTfzNTk2WS5D0dDlqYCaPG+AG4Z8wJkn1KrBc7AhspZJUQ==
+vue-router@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
+  integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==

 vue-sequential-entrance@1.1.3:
  version "1.1.3"
@@ -11814,10 +11925,10 @@ vue-style-loader@4.1.2, vue-style-loader@^4.1.0:
    hash-sum "^1.0.2"
    loader-utils "^1.0.2"

-vue-svg-inline-loader@1.2.17:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/vue-svg-inline-loader/-/vue-svg-inline-loader-1.2.17.tgz#1495d9d0349412c6aadb733d39bd13a2526fc169"
-  integrity sha512-lDJ+BsXz9CiqYdPQuQkuyETs8PvKYSKwiMwGhXIyUdif962o9tQrI9euiEwQ8lWDlj2wUx/Ct4Z8YIdl35h9wA==
+vue-svg-inline-loader@1.2.18:
+  version "1.2.18"
+  resolved "https://registry.yarnpkg.com/vue-svg-inline-loader/-/vue-svg-inline-loader-1.2.18.tgz#29c4e53d10567a59520929926e7a402a156425ce"
+  integrity sha512-yKWUs6ZrvpNkcW11IljeUhj9EoUrdTtkFyTwZYP7h6pHBJq+2iVKkIBZ7S3s84N2ifJBjsrIH8rX0JDJ1MAAbg==
  dependencies:
    "@babel/polyfill" "^7.4.4"
    "@babel/runtime" "^7.5.5"
@@ -11912,10 +12023,10 @@ webidl-conversions@^4.0.2:
  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==

-webpack-cli@3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.7.tgz#77c8580dd8e92f69d635e0238eaf9d9c15759a91"
-  integrity sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==
+webpack-cli@3.3.8:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.8.tgz#caeaebcc26f685db1736e5decd3f01aac30123ec"
+  integrity sha512-RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==
  dependencies:
    chalk "2.4.2"
    cross-spawn "6.0.5"
@@ -11937,7 +12048,7 @@ webpack-sources@^1.0.1:
    source-list-map "^2.0.0"
    source-map "~0.6.1"

-webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
  version "1.4.3"
  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
Author	SHA1	Message	Date
syuilo	b719d43049	11.32.0	2019-09-10 15:48:37 +09:00
syuilo	f555aa734b	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-09-10 15:46:20 +09:00
syuilo	37fb685016	Update dependencies 🚀	2019-09-10 15:46:00 +09:00
syuilo	09fe1b355a	New Crowdin translations (#5385 ) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (French) * New translations ja-JP.yml (French) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Portuguese) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (English) * New translations ja-JP.yml (French) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (Portuguese) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai)	2019-09-10 15:44:25 +09:00
Aya Morisawa	9d530a5c38	Fix typo: ommited -> omitted (#5406 )	2019-09-09 22:47:52 +09:00
MeiMei	827c378ac1	AP Lock (#5410 )	2019-09-09 22:46:45 +09:00
syuilo	9b91b92bca	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-09-09 22:28:48 +09:00
syuilo	e7fcca0e06	Fix #5403	2019-09-09 22:28:41 +09:00
syuilo	a36e5b4543	Refactoring	2019-09-09 22:18:32 +09:00
syuilo	ba474648a2	Update CONTRIBUTING.md	2019-09-08 21:21:08 +09:00
MeiMei	a7b710a2f8	広告ブロッカーの警告を削除 (#5408 ) * remove fckadbloack follow-buttonが消されないように * revert version * remove locales	2019-09-08 21:19:28 +09:00
MeiMei	c033464b92	AP Undo Announce (#5400 ) * AP Undo Announce * Use activity id	2019-09-08 11:30:44 +09:00
Acid Chicken (硫酸鶏)	3ef6305c76	Update README.md [AUTOGEN] (#5402 )	2019-09-07 23:43:35 +09:00
Acid Chicken (硫酸鶏)	511ef20b8a	Update README.md [AUTOGEN] (#5396 )	2019-09-05 05:05:24 +09:00
syuilo	4db710a4b0	Fix indentation	2019-09-04 14:35:21 +09:00
Acid Chicken (硫酸鶏)	efe92724a4	Update README.md [AUTOGEN] (#5390 )	2019-09-04 04:25:22 +09:00
syuilo	aa19767ebc	11.31.4	2019-09-03 08:00:41 +09:00
syuilo	143190ab38	Fix bug	2019-09-03 08:00:21 +09:00