From 33b3475422238931a8e082a3af26da5a52d34949 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 14:52:36 +0900
Subject: [PATCH 1/9] :v:

---
 package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 669172338..ca81a956a 100644
--- a/package.json
+++ b/package.json
@@ -215,9 +215,7 @@
 		"webpack-cli": "2.1.4",
 		"websocket": "1.0.26",
 		"ws": "5.2.0",
-		"xev": "2.0.1"
-	},
-	"devDependencies": {
+		"xev": "2.0.1",
 		"@types/file-type": "5.2.1",
 		"@types/jsdom": "11.0.5"
 	}

From 37a1eeeccbdc140c399badf05c367ff6bc5ba9fe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 14:54:09 +0900
Subject: [PATCH 2/9] 4.2.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ca81a956a..d84a63bc9 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "4.1.1",
-	"clientVersion": "1.0.6542",
+	"version": "4.2.0",
+	"clientVersion": "1.0.6620",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

From 6eb67d85db5775f9b8a73237c76207111736f06e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 15:05:38 +0900
Subject: [PATCH 3/9] :v:

---
 assets/icons/128.png            |  3 +++
 assets/icons/16.png             |  3 +++
 assets/icons/192.png            |  3 +++
 assets/icons/256.png            |  3 +++
 assets/icons/32.png             |  3 +++
 assets/icons/64.png             |  3 +++
 src/client/assets/manifest.json | 12 ++++++------
 7 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 assets/icons/128.png
 create mode 100644 assets/icons/16.png
 create mode 100644 assets/icons/192.png
 create mode 100644 assets/icons/256.png
 create mode 100644 assets/icons/32.png
 create mode 100644 assets/icons/64.png

diff --git a/assets/icons/128.png b/assets/icons/128.png
new file mode 100644
index 000000000..6b00970da
--- /dev/null
+++ b/assets/icons/128.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f44939dd372202e33ad5065a0e0b3f05031627961a59c1b87829eb6253067042
+size 3143
diff --git a/assets/icons/16.png b/assets/icons/16.png
new file mode 100644
index 000000000..4242ce749
--- /dev/null
+++ b/assets/icons/16.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89ad19f254862300592b4f7e0978b223adf88f5f6e6e96b125b397299f1753ca
+size 446
diff --git a/assets/icons/192.png b/assets/icons/192.png
new file mode 100644
index 000000000..d134dae6a
--- /dev/null
+++ b/assets/icons/192.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a68d3bb2aa5534ade047144744126fd119ceb6e86d68421229b3d8274b5496ba
+size 4666
diff --git a/assets/icons/256.png b/assets/icons/256.png
new file mode 100644
index 000000000..b06bbe907
--- /dev/null
+++ b/assets/icons/256.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d52f93b719d434dd11ab5d8b4b334402bfdb604ca99c018a1176e286cd42ae26
+size 4824
diff --git a/assets/icons/32.png b/assets/icons/32.png
new file mode 100644
index 000000000..a9a95ea90
--- /dev/null
+++ b/assets/icons/32.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e69c47ed93bf729f2c23a6fb2e33e4abb01d4d8eafee22aaa224cd93fcca303
+size 774
diff --git a/assets/icons/64.png b/assets/icons/64.png
new file mode 100644
index 000000000..419787497
--- /dev/null
+++ b/assets/icons/64.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75dc868e81c786a16972f41d1866acc65b9221843fced13d041522aaef147823
+size 1330
diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json
index 25be82fdc..29ce9c6f1 100644
--- a/src/client/assets/manifest.json
+++ b/src/client/assets/manifest.json
@@ -6,32 +6,32 @@
 	"background_color": "#313a42",
 	"icons": [
 		{
-			"src": "/assets/favicon/16.png",
+			"src": "/assets/icon/16.png",
 			"size": "16x16",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/favicon/32.png",
+			"src": "/assets/icon/32.png",
 			"size": "32x32",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/favicon/64.png",
+			"src": "/assets/icon/64.png",
 			"size": "64x64",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/favicon/128.png",
+			"src": "/assets/icon/128.png",
 			"size": "128x128",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/favicon/192.png",
+			"src": "/assets/icon/192.png",
 			"size": "192x192",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/favicon/256.png",
+			"src": "/assets/icon/256.png",
 			"size": "256x256",
 			"type": "image/png"
 		}

From e9484c67c2d668e11f1c8ae2f686edb7b0631382 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 15:12:29 +0900
Subject: [PATCH 4/9] Clean up

---
 src/server/web/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index d38d9165d..050fc3c76 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -49,8 +49,6 @@ const router = new Router();
 //#region static assets
 
 router.get('/assets/*', async ctx => {
-	// 互換性のため
-	const path = ctx.path.replace('.raw.js', '.js').replace('.min.js', '.js');
 	await send(ctx, path, {
 		root: client,
 		maxage: ms('7 days'),

From 8b8f0a0abeda1b9790c4c9bf954235a1968e505d Mon Sep 17 00:00:00 2001
From: tosuke <tasukeprg@gmail.com>
Date: Mon, 18 Jun 2018 15:38:58 +0900
Subject: [PATCH 5/9] Fix path

---
 src/client/assets/manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json
index 29ce9c6f1..540d220aa 100644
--- a/src/client/assets/manifest.json
+++ b/src/client/assets/manifest.json
@@ -6,32 +6,32 @@
 	"background_color": "#313a42",
 	"icons": [
 		{
-			"src": "/assets/icon/16.png",
+			"src": "/assets/icons/16.png",
 			"size": "16x16",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icon/32.png",
+			"src": "/assets/icons/32.png",
 			"size": "32x32",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icon/64.png",
+			"src": "/assets/icons/64.png",
 			"size": "64x64",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icon/128.png",
+			"src": "/assets/icons/128.png",
 			"size": "128x128",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icon/192.png",
+			"src": "/assets/icons/192.png",
 			"size": "192x192",
 			"type": "image/png"
 		},
 		{
-			"src": "/assets/icon/256.png",
+			"src": "/assets/icons/256.png",
 			"size": "256x256",
 			"type": "image/png"
 		}

From 9356d38eac03d3f3ae9a4deffba933fdee21cd25 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 16:34:26 +0900
Subject: [PATCH 6/9] Fix bug

---
 src/server/web/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 050fc3c76..4400fc102 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -49,7 +49,7 @@ const router = new Router();
 //#region static assets
 
 router.get('/assets/*', async ctx => {
-	await send(ctx, path, {
+	await send(ctx, ctx.path, {
 		root: client,
 		maxage: ms('7 days'),
 		immutable: true

From 1b14e4eed5c978437341c7ff7b0e89286c5be04b Mon Sep 17 00:00:00 2001
From: tosuke <tasukeprg@gmail.com>
Date: Mon, 18 Jun 2018 16:44:42 +0900
Subject: [PATCH 7/9] replace "size" to "sizes"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

やらかした
---
 src/client/assets/manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json
index 540d220aa..dcd1e2679 100644
--- a/src/client/assets/manifest.json
+++ b/src/client/assets/manifest.json
@@ -7,32 +7,32 @@
 	"icons": [
 		{
 			"src": "/assets/icons/16.png",
-			"size": "16x16",
+			"sizes": "16x16",
 			"type": "image/png"
 		},
 		{
 			"src": "/assets/icons/32.png",
-			"size": "32x32",
+			"sizes": "32x32",
 			"type": "image/png"
 		},
 		{
 			"src": "/assets/icons/64.png",
-			"size": "64x64",
+			"sizes": "64x64",
 			"type": "image/png"
 		},
 		{
 			"src": "/assets/icons/128.png",
-			"size": "128x128",
+			"sizes": "128x128",
 			"type": "image/png"
 		},
 		{
 			"src": "/assets/icons/192.png",
-			"size": "192x192",
+			"sizes": "192x192",
 			"type": "image/png"
 		},
 		{
 			"src": "/assets/icons/256.png",
-			"size": "256x256",
+			"sizes": "256x256",
 			"type": "image/png"
 		}
 	],

From 8187cc3da078a4c109a1f95cf7951ebdff2e7c55 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 17:25:20 +0900
Subject: [PATCH 8/9] nanka

---
 locales/en.yml                                           | 1 +
 locales/ja.yml                                           | 1 +
 src/client/app/common/views/components/reaction-icon.vue | 5 ++++-
 src/client/app/desktop/views/components/settings.vue     | 7 +++++++
 src/client/app/desktop/views/pages/welcome.vue           | 2 +-
 src/client/app/mobile/views/pages/settings.vue           | 8 ++++++++
 src/client/app/store.ts                                  | 3 ++-
 src/client/assets/reactions/sushi.png                    | 3 +++
 8 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 src/client/assets/reactions/sushi.png

diff --git a/locales/en.yml b/locales/en.yml
index 8b54a6616..778d54076 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -47,6 +47,7 @@ common:
   ok: "OK"
   update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
   my-token-regenerated: "Your token has been renewed so you will be signed out."
+  i-like-sushi: "I like sushi rather than pudding"
   widgets:
     analog-clock: "Analog clock"
     profile: "Profile"
diff --git a/locales/ja.yml b/locales/ja.yml
index 29decefe6..f2a85eb4e 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -52,6 +52,7 @@ common:
   ok: "わかった"
   update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
 
   widgets:
     analog-clock: "アナログ時計"
diff --git a/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue
index 7d24f4f9e..2d5391a21 100644
--- a/src/client/app/common/views/components/reaction-icon.vue
+++ b/src/client/app/common/views/components/reaction-icon.vue
@@ -8,7 +8,10 @@
 	<img v-if="reaction == 'congrats'" src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%">
 	<img v-if="reaction == 'angry'" src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%">
 	<img v-if="reaction == 'confused'" src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%">
-	<img v-if="reaction == 'pudding'" src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+	<template v-if="reaction == 'pudding'">
+		<img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="/assets/reactions/sushi.png" alt="%i18n:common.reactions.pudding%">
+		<img v-else src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+	</template>
 </span>
 </template>
 
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index c660c2869..536d270dc 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -45,6 +45,7 @@
 				<mk-switch v-model="darkmode" text="%i18n:@dark-mode%"/>
 				<mk-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons" text="%i18n:@circle-icons%"/>
 				<mk-switch v-model="$store.state.settings.gradientWindowHeader" @change="onChangeGradientWindowHeader" text="%i18n:@gradient-window-header%"/>
+				<mk-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi" text="%i18n:common.i-like-sushi%"/>
 			</div>
 			<mk-switch v-model="$store.state.settings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="%i18n:@post-form-on-timeline%"/>
 			<mk-switch v-model="$store.state.settings.showReplyTarget" @change="onChangeShowReplyTarget" text="%i18n:@show-reply-target%"/>
@@ -362,6 +363,12 @@ export default Vue.extend({
 				value: v
 			});
 		},
+		onChangeILikeSushi(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'iLikeSushi',
+				value: v
+			});
+		},
 		onChangeGradientWindowHeader(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'gradientWindowHeader',
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 70fa0123a..029e44e27 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -13,7 +13,7 @@
 					<h1 v-else><img :src="$store.state.device.darkmode ? 'assets/title.dark.svg' : 'assets/title.light.svg'" alt="Misskey"></h1>
 					<p class="powerd-by" v-if="name">powerd by <b>Misskey</b></p>
 					<p class="desc" v-html="description || '%i18n:common.about%'"></p>
-					<a ref="signup" @click="signup">%i18n:@signup%</a>
+					<a ref="signup" @click="signup">📦 %i18n:@signup%</a>
 				</div>
 				<div class="login">
 					<mk-signin/>
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 1c5a43ede..34482fccb 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -12,6 +12,7 @@
 
 				<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
 				<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
+				<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
 
 				<div>
 					<div>%i18n:@timeline%</div>
@@ -174,6 +175,13 @@ export default Vue.extend({
 			});
 		},
 
+		onChangeILikeSushi(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'iLikeSushi',
+				value: v
+			});
+		},
+
 		onChangeShowReplyTarget(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'showReplyTarget',
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 267c804fb..1bc39ae66 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -18,7 +18,8 @@ const defaultSettings = {
 	showRenotedMyNotes: true,
 	loadRemoteMedia: true,
 	disableViaMobile: false,
-	memo: null
+	memo: null,
+	iLikeSushi: false
 };
 
 const defaultDeviceSettings = {
diff --git a/src/client/assets/reactions/sushi.png b/src/client/assets/reactions/sushi.png
new file mode 100644
index 000000000..020bf2fa1
--- /dev/null
+++ b/src/client/assets/reactions/sushi.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6e59584722a4977cb2624812116435432e5c5c40fba3bd3ae26ac4ca13da8a3
+size 8651

From 90a5b5e12b079181bc7de6ddcec9b2d71ee23061 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 18 Jun 2018 17:25:45 +0900
Subject: [PATCH 9/9] 4.3.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d84a63bc9..9961782c9 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "4.2.0",
-	"clientVersion": "1.0.6620",
+	"version": "4.3.0",
+	"clientVersion": "1.0.6630",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,