Merge branch 'master' of https://github.com/syuilo/misskey

14 files changed, 17 insertions, 17 deletions

diff --git a/README.md b/README.md
index 120e9fa5c0..7a10f5b811 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ ultimately sophisticated professional microblogging software.
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
-![](https://c10.patreonusercontent.com/3/e30%3D/patreon-posts/RsKWEDEKf8D_wYDQWAbex9CSb-1DnXW1nfqfLvuys5ROj2k0VF6_luuzHMTyf95n.png?token-time=1529539200&token-hash=RmcSP0947mw5o2-B6g1L6aU_OoDXANe198kLU6HMO30%3D)
+![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
 
 :sparkles: Features
 ----------------------------------------------------------------
diff --git a/locales/de.yml b/locales/de.yml
index 2348097ebe..4feec5b0cc 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "Medien von deinem PC hinzufügen"
   attach-media-from-drive: "Medien von deinem Speicher hinzufügen"
   attach-cancel: "Hinzufügen abbrechen"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Eine Abstimmung erstellen"
   text-remain: "{} Zeichen verbleibend"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/en.yml b/locales/en.yml
index 645b4e9407..83d1c9e427 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "Attach media from your PC"
   attach-media-from-drive: "Attach media from your Drive"
   attach-cancel: "Cancel attachment"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Create a poll"
   text-remain: "{} characters remaining"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/es.yml b/locales/es.yml
index da41dcb24f..944c8a6699 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "Adjunta multimedia desde tu Disco"
   attach-cancel: "Quitar el archivo adjunto"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Crea una encuesta"
   text-remain: "quedan {} caracteres"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/fr.yml b/locales/fr.yml
index fb47c0db47..199c633eef 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "Joindre un media depuis votre PC"
   attach-media-from-drive: "Joindre un media depuis votre Drive"
   attach-cancel: "Annuler la jointure de fichier"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Créer un sondage"
   text-remain: "{} charactères restants"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/it.yml b/locales/it.yml
index c911f7561e..4cd959cab4 100644
--- a/locales/it.yml
+++ b/locales/it.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/ja.yml b/locales/ja.yml
index 0f1d9cd510..0d552565f2 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -461,7 +461,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 
diff --git a/locales/ko.yml b/locales/ko.yml
index c911f7561e..4cd959cab4 100644
--- a/locales/ko.yml
+++ b/locales/ko.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/pl.yml b/locales/pl.yml
index 21a89fab8a..68fe4ea586 100644
--- a/locales/pl.yml
+++ b/locales/pl.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "Załącz zawartość multimedialną z komputera"
   attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
   attach-cancel: "Usuń załącznik"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Utwórz ankietę"
   text-remain: "pozostałe znaki: {}"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/pt.yml b/locales/pt.yml
index 5627facd31..91c76e312f 100644
--- a/locales/pt.yml
+++ b/locales/pt.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/ru.yml b/locales/ru.yml
index acf1115b00..32a787a43b 100644
--- a/locales/ru.yml
+++ b/locales/ru.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
diff --git a/locales/zh.yml b/locales/zh.yml
index d50544222c..23adc4a3b6 100644
--- a/locales/zh.yml
+++ b/locales/zh.yml
@@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "PCからメディアを添付"
   attach-media-from-drive: "ドライブからメディアを添付"
   attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "アンケートを作成"
   text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
diff --git a/package.json b/package.json
index eb983830f9..5a26eba0c1 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.0.21",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.3.5",
+		"@types/node": "10.3.6",
 		"@types/nopt": "3.0.29",
 		"@types/parse5": "5.0.0",
 		"@types/pug": "2.0.4",
@@ -80,7 +80,7 @@
 		"@types/speakeasy": "2.0.2",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.2",
+		"@types/webpack": "4.4.3",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
 		"@types/ws": "5.1.2",
@@ -102,7 +102,7 @@
 		"element-ui": "2.4.1",
 		"emojilib": "2.2.12",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.0.0",
+		"eslint": "5.0.1",
 		"eslint-plugin-vue": "4.5.0",
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
@@ -126,7 +126,7 @@
 		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.9.0",
 		"highlight.js": "9.12.0",
-		"html-minifier": "3.5.16",
+		"html-minifier": "3.5.17",
 		"http-signature": "1.2.0",
 		"inquirer": "6.0.0",
 		"is-root": "2.0.0",
diff --git a/src/client/app/common/scripts/get-kao.ts b/src/client/app/common/scripts/get-kao.ts
index 2168c5be88..d380187510 100644
--- a/src/client/app/common/scripts/get-kao.ts
+++ b/src/client/app/common/scripts/get-kao.ts
@@ -1,5 +1,5 @@
 export default () => [
 	'(=^・・^=)',
-	'v(‘ω’)v',
+	'v('ω')v',
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
 ][Math.floor(Math.random() * 3)];