From 33d79420eb3c860d377258289b87def4a69c6778 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 19 Jun 2019 17:47:24 +0900
Subject: [PATCH 01/15] Fix code style

---
 src/mfm/language.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mfm/language.ts b/src/mfm/language.ts
index 4750ea338..75a2baaab 100644
--- a/src/mfm/language.ts
+++ b/src/mfm/language.ts
@@ -157,12 +157,14 @@ export const mfmLanguage = P.createLanguage({
 			let url: string;
 			if (!match) {
 				const match = text.match(/^<(https?:\/\/.*?)>/);
-				if (!match)
+				if (!match) {
 					return P.makeFailure(i, 'not a url');
+				}
 				url = match[1];
 				i += 2;
-			} else
+			} else {
 				url = match[0];
+			}
 			url = removeOrphanedBrackets(url);
 			while (url.endsWith('.') || url.endsWith(',')) {
 				if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));

From 2c1932faa72ef6f2c30df62e5b3248f2c0b77948 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 20 Jun 2019 22:52:35 +0900
Subject: [PATCH 02/15] Add psql version to info page

---
 src/server/web/index.ts       | 2 ++
 src/server/web/views/info.pug | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index c5a3497f4..ba8f0649c 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -20,6 +20,7 @@ import { Users, Notes, Emojis, UserProfiles, Pages } from '../../models';
 import parseAcct from '../../misc/acct/parse';
 import getNoteSummary from '../../misc/get-note-summary';
 import { ensure } from '../../prelude/ensure';
+import { getConnection } from 'typeorm';
 
 const client = `${__dirname}/../../client/`;
 
@@ -250,6 +251,7 @@ router.get('/info', async ctx => {
 		machine: os.hostname(),
 		os: os.platform(),
 		node: process.version,
+		psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version),
 		cpu: {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index c8b0bd939..f18dcd45e 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -85,6 +85,9 @@ html
 				tr
 					th Node version
 					td= node
+				tr
+					th PSQL version
+					td= psql
 				tr
 					th Machine
 					td= machine

From bd839399933350bad12842d0170cf3c28f9a75d2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 20 Jun 2019 22:55:57 +0900
Subject: [PATCH 03/15] Provide Redis version

---
 src/client/app/common/views/widgets/server.info.vue | 1 +
 src/server/api/endpoints/meta.ts                    | 2 ++
 src/server/web/index.ts                             | 2 ++
 src/server/web/views/info.pug                       | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue
index 41ccd23bf..c6e0d68b1 100644
--- a/src/client/app/common/views/widgets/server.info.vue
+++ b/src/client/app/common/views/widgets/server.info.vue
@@ -4,6 +4,7 @@
 	<p>Machine: {{ meta.machine }}</p>
 	<p>Node: {{ meta.node }}</p>
 	<p>PSQL: {{ meta.psql }}</p>
+	<p>Redis: {{ meta.redis }}</p>
 	<p>Version: {{ meta.version }} </p>
 </div>
 </template>
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 4da0c7476..1aa9a855d 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -7,6 +7,7 @@ import * as pkg from '../../../../package.json';
 import { Emojis } from '../../../models';
 import { types, bool } from '../../../misc/schema';
 import { getConnection } from 'typeorm';
+import redis from '../../../db/redis';
 
 export const meta = {
 	stability: 'stable',
@@ -116,6 +117,7 @@ export default define(meta, async (ps, me) => {
 		os: os.platform(),
 		node: process.version,
 		psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version),
+		redis: redis.server_info.redis_version,
 
 		cpu: {
 			model: os.cpus()[0].model,
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index ba8f0649c..8cf6a7520 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -21,6 +21,7 @@ import parseAcct from '../../misc/acct/parse';
 import getNoteSummary from '../../misc/get-note-summary';
 import { ensure } from '../../prelude/ensure';
 import { getConnection } from 'typeorm';
+import redis from '../../db/redis';
 
 const client = `${__dirname}/../../client/`;
 
@@ -252,6 +253,7 @@ router.get('/info', async ctx => {
 		os: os.platform(),
 		node: process.version,
 		psql: await getConnection().query('SHOW server_version').then(x => x[0].server_version),
+		redis: redis.server_info.redis_version,
 		cpu: {
 			model: os.cpus()[0].model,
 			cores: os.cpus().length
diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug
index f18dcd45e..fc71e5c19 100644
--- a/src/server/web/views/info.pug
+++ b/src/server/web/views/info.pug
@@ -88,6 +88,9 @@ html
 				tr
 					th PSQL version
 					td= psql
+				tr
+					th Redis version
+					td= redis
 				tr
 					th Machine
 					td= machine

From 18184441f1eabb34696ea4771051eb3aa8334ce4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 21 Jun 2019 01:50:01 +0900
Subject: [PATCH 04/15] =?UTF-8?q?=E3=83=9B=E3=83=BC=E3=83=A0=E3=81=AE?=
 =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E=E3=82=A4=E3=82=BA=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=82=92=E8=A4=87=E6=95=B0=E3=81=AE=E3=83=87=E3=83=90?=
 =?UTF-8?q?=E3=82=A4=E3=82=B9=E9=96=93=E3=81=A7=E5=90=8C=E6=9C=9F=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                             |  2 ++
 .../views/components/settings/settings.vue    | 16 ++++++++++
 src/client/app/desktop/views/home/home.vue    | 16 ++++++++--
 src/client/app/mobile/views/pages/widgets.vue | 14 ++++++++-
 src/client/app/store.ts                       | 30 +++++++++++++++++++
 5 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d9223b1c4..bdf8c24ce 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -282,6 +282,8 @@ common:
     disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
     load-raw-images: "添付された画像を高画質で表示する"
     load-remote-media: "リモートサーバーのメディアを表示する"
+    sync: "同期"
+    home-profile: "ホームのプロファイル"
 
   search: "検索"
   delete: "削除"
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 0cbc40da5..1c02bdee8 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -131,6 +131,12 @@
 				</section>
 			</section>
 
+			<section>
+				<header>{{ $t('@._settings.sync') }}</header>
+				<ui-input v-if="$root.isMobile" v-model="homeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-else v-model="mobileHomeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
+			</section>
+
 			<section>
 				<header>{{ $t('@._settings.web-search-engine') }}</header>
 				<ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template></ui-input>
@@ -500,6 +506,16 @@ export default Vue.extend({
 			get() { return this.$store.state.device.mobileNotificationPosition; },
 			set(value) { this.$store.commit('device/set', { key: 'mobileNotificationPosition', value }); }
 		},
+
+		homeProfile: {
+			get() { return this.$store.state.device.homeProfile; },
+			set(value) { this.$store.commit('device/set', { key: 'homeProfile', value }); }
+		},
+
+		mobileHomeProfile: {
+			get() { return this.$store.state.device.mobileHomeProfile; },
+			set(value) { this.$store.commit('device/set', { key: 'mobileHomeProfile', value }); }
+		},
 	},
 	created() {
 		this.$root.getMeta().then(meta => {
diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue
index d4677df84..49ac4c240 100644
--- a/src/client/app/desktop/views/home/home.vue
+++ b/src/client/app/desktop/views/home/home.vue
@@ -102,7 +102,11 @@ export default Vue.extend({
 	computed: {
 		home(): any[] {
 			if (this.$store.getters.isSignedIn) {
-				return this.$store.state.device.home || [];
+				if (this.$store.state.device.homeProfile) {
+					return this.$store.state.settings.homeProfiles[this.$store.state.device.homeProfile] || this.$store.state.device.home || [];
+				} else {
+					return this.$store.state.device.home || [];
+				}
 			} else {
 				return [{
 					name: 'instance',
@@ -186,6 +190,14 @@ export default Vue.extend({
 			if (this.$store.state.device.home == null) {
 				this.$store.commit('device/setHome', _defaultDesktopHomeWidgets);
 			}
+
+			if (this.$store.state.device.homeProfile) {
+				this.$watch('$store.state.device.home', () => {
+					this.$store.dispatch('settings/updateHomeProfile');
+				}, {
+					deep: true
+				});
+			}
 		}
 	},
 
@@ -245,7 +257,7 @@ export default Vue.extend({
 
 		focus() {
 			(this.$refs.content as any).focus();
-		}
+		},
 	}
 });
 </script>
diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue
index 7130fddb3..7f0ef678d 100644
--- a/src/client/app/mobile/views/pages/widgets.vue
+++ b/src/client/app/mobile/views/pages/widgets.vue
@@ -72,7 +72,11 @@ export default Vue.extend({
 
 	computed: {
 		widgets(): any[] {
-			return this.$store.state.device.mobileHome;
+			if (this.$store.state.device.mobileHomeProfile) {
+				return this.$store.state.settings.mobileHomeProfiles[this.$store.state.device.mobileHomeProfile] || this.$store.state.device.mobileHome;
+			} else {
+				return this.$store.state.device.mobileHome;
+			}
 		}
 	},
 
@@ -98,6 +102,14 @@ export default Vue.extend({
 				id: 'g', data: {}
 			}]);
 		}
+
+		if (this.$store.state.device.mobileHomeProfile) {
+			this.$watch('$store.state.device.mobileHome', () => {
+				this.$store.dispatch('settings/updateMobileHomeProfile');
+			}, {
+				deep: true
+			});
+		}
 	},
 
 	mounted() {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 6f545eb09..7b56628b3 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -34,10 +34,14 @@ const defaultSettings = {
 	gamesReversiShowBoardLabels: false,
 	gamesReversiUseAvatarStones: true,
 	disableAnimatedMfm: false,
+	homeProfiles: {},
+	mobileHomeProfiles: {},
 };
 
 const defaultDeviceSettings = {
 	home: null,
+	homeProfile: null,
+	mobileHomeProfile: null,
 	mobileHome: [],
 	deck: null,
 	deckMode: false,
@@ -361,6 +365,32 @@ export default (os: MiOS) => new Vuex.Store({
 						});
 					}
 				},
+
+				updateHomeProfile(ctx) {
+					const profiles = ctx.state.homeProfiles;
+					profiles[ctx.rootState.device.homeProfile] = ctx.rootState.device.home;
+					ctx.commit('set', {
+						key: 'homeProfiles',
+						value: profiles
+					});
+					os.api('i/update-client-setting', {
+						name: 'homeProfiles',
+						value: profiles
+					});
+				},
+
+				updateMobileHomeProfile(ctx) {
+					const profiles = ctx.state.mobileHomeProfiles;
+					profiles[ctx.rootState.device.mobileHomeProfile] = ctx.rootState.device.mobileHome;
+					ctx.commit('set', {
+						key: 'mobileHomeProfiles',
+						value: profiles
+					});
+					os.api('i/update-client-setting', {
+						name: 'mobileHomeProfiles',
+						value: profiles
+					});
+				}
 			}
 		}
 	}

From 2b8d0225cc43971fc7b9dc27447725233a73208c Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 21 Jun 2019 11:50:38 +0900
Subject: [PATCH 05/15] Enable ServiceWorker (#5075)

---
 src/client/app/mios.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index ae1446b93..a73ef45c3 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -173,10 +173,9 @@ export default class MiOS extends EventEmitter {
 
 			// Init service worker
 			if (this.shouldRegisterSw) {
-				// #4813
-				//this.getMeta().then(data => {
-				//	this.registerSw(data.swPublickey);
-				//});
+				this.getMeta().then(data => {
+					this.registerSw(data.swPublickey);
+				});
 			}
 		};
 

From 6136f6f33a70459d3e52b4273f57628376dd15a9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 21 Jun 2019 13:06:47 +0900
Subject: [PATCH 06/15] =?UTF-8?q?=E3=83=87=E3=83=83=E3=82=AD=E3=81=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=82=92=E5=90=8C=E6=9C=9F=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                             |  1 +
 .../views/components/settings/settings.vue    |  6 ++++
 .../app/common/views/deck/deck.column.vue     |  3 +-
 src/client/app/common/views/deck/deck.vue     | 29 +++++++++++++++----
 src/client/app/store.ts                       | 17 ++++++++++-
 5 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index bdf8c24ce..47e1d4d93 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -284,6 +284,7 @@ common:
     load-remote-media: "リモートサーバーのメディアを表示する"
     sync: "同期"
     home-profile: "ホームのプロファイル"
+    deck-profile: "デッキのプロファイル"
 
   search: "検索"
   delete: "削除"
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 1c02bdee8..094791a15 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -135,6 +135,7 @@
 				<header>{{ $t('@._settings.sync') }}</header>
 				<ui-input v-if="$root.isMobile" v-model="homeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
 				<ui-input v-else v-model="mobileHomeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-model="deckProfile">{{ $t('@._settings.deck-profile') }}</ui-input>
 			</section>
 
 			<section>
@@ -516,6 +517,11 @@ export default Vue.extend({
 			get() { return this.$store.state.device.mobileHomeProfile; },
 			set(value) { this.$store.commit('device/set', { key: 'mobileHomeProfile', value }); }
 		},
+
+		deckProfile: {
+			get() { return this.$store.state.device.deckProfile; },
+			set(value) { this.$store.commit('device/set', { key: 'deckProfile', value }); }
+		},
 	},
 	created() {
 		this.$root.getMeta().then(meta => {
diff --git a/src/client/app/common/views/deck/deck.column.vue b/src/client/app/common/views/deck/deck.column.vue
index eaa344d36..b09fdfbfe 100644
--- a/src/client/app/common/views/deck/deck.column.vue
+++ b/src/client/app/common/views/deck/deck.column.vue
@@ -146,7 +146,8 @@ export default Vue.extend({
 
 		toggleActive() {
 			if (!this.isStacked) return;
-			const vms = this.$store.state.device.deck.layout.find(ids => ids.indexOf(this.column.id) != -1).map(id => this.getColumnVm(id));
+			const deck = this.$store.state.device.deckProfile ? this.$store.state.settings.deckProfiles[this.$store.state.device.deckProfile] : this.$store.state.device.deck;
+			const vms = deck.layout.find(ids => ids.indexOf(this.column.id) != -1).map(id => this.getColumnVm(id));
 			if (this.active && countIf(vm => vm.$el.classList.contains('active'), vms) == 1) return;
 			this.active = !this.active;
 		},
diff --git a/src/client/app/common/views/deck/deck.vue b/src/client/app/common/views/deck/deck.vue
index b46f2167a..e07e504ed 100644
--- a/src/client/app/common/views/deck/deck.vue
+++ b/src/client/app/common/views/deck/deck.vue
@@ -25,20 +25,29 @@ import * as uuid from 'uuid';
 
 export default Vue.extend({
 	i18n: i18n('deck'),
+
 	components: {
 		XColumnCore
 	},
 
 	computed: {
+		deck() {
+			if (this.$store.state.device.deckProfile) {
+				return this.$store.state.settings.deckProfiles[this.$store.state.device.deckProfile] || this.$store.state.device.deck;
+			} else {
+				return this.$store.state.device.deck;
+			}
+		},
+
 		columns(): any[] {
-			if (this.$store.state.device.deck == null) return [];
-			return this.$store.state.device.deck.columns;
+			if (this.deck == null) return [];
+			return this.deck.columns;
 		},
 
 		layout(): any[] {
-			if (this.$store.state.device.deck == null) return [];
-			if (this.$store.state.device.deck.layout == null) return this.$store.state.device.deck.columns.map(c => [c.id]);
-			return this.$store.state.device.deck.layout;
+			if (this.deck == null) return [];
+			if (this.deck.layout == null) return this.deck.columns.map(c => [c.id]);
+			return this.deck.layout;
 		},
 
 		style(): any {
@@ -75,7 +84,7 @@ export default Vue.extend({
 	},
 
 	created() {
-		if (this.$store.state.device.deck == null) {
+		if (this.deck == null) {
 			const deck = {
 				columns: [/*{
 					type: 'widgets',
@@ -106,6 +115,14 @@ export default Vue.extend({
 				value: deck
 			});
 		}
+
+		if (this.$store.state.device.deckProfile) {
+			this.$watch('$store.state.device.deck', () => {
+				this.$store.dispatch('settings/updateDeckProfile');
+			}, {
+				deep: true
+			});
+		}
 	},
 
 	mounted() {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 7b56628b3..4a6e1a610 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -36,6 +36,7 @@ const defaultSettings = {
 	disableAnimatedMfm: false,
 	homeProfiles: {},
 	mobileHomeProfiles: {},
+	deckProfiles: {},
 };
 
 const defaultDeviceSettings = {
@@ -44,6 +45,7 @@ const defaultDeviceSettings = {
 	mobileHomeProfile: null,
 	mobileHome: [],
 	deck: null,
+	deckProfile: null,
 	deckMode: false,
 	deckColumnAlign: 'center',
 	deckColumnWidth: 'normal',
@@ -390,7 +392,20 @@ export default (os: MiOS) => new Vuex.Store({
 						name: 'mobileHomeProfiles',
 						value: profiles
 					});
-				}
+				},
+
+				updateDeckProfile(ctx) {
+					const profiles = ctx.state.deckProfiles;
+					profiles[ctx.rootState.device.deckProfile] = ctx.rootState.device.deck;
+					ctx.commit('set', {
+						key: 'deckProfiles',
+						value: profiles
+					});
+					os.api('i/update-client-setting', {
+						name: 'deckProfiles',
+						value: profiles
+					});
+				},
 			}
 		}
 	}

From aec5911821cf55dbe8704be964c5ebd3a4a7b66b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 21 Jun 2019 15:08:17 +0900
Subject: [PATCH 07/15] Improve sync

---
 src/client/app/common/define-widget.ts        |   4 +-
 .../views/components/settings/settings.vue    |   4 +-
 .../app/common/views/deck/deck.column.vue     |  18 +-
 .../app/common/views/deck/deck.tl-column.vue  |   2 +-
 src/client/app/common/views/deck/deck.vue     |  34 +-
 .../common/views/deck/deck.widgets-column.vue |   6 +-
 src/client/app/desktop/views/home/home.vue    |  27 +-
 src/client/app/mobile/views/pages/widgets.vue |  26 +-
 src/client/app/store.ts                       | 396 ++++++++++--------
 9 files changed, 262 insertions(+), 255 deletions(-)

diff --git a/src/client/app/common/define-widget.ts b/src/client/app/common/define-widget.ts
index 632ddf2ed..ba4deafe3 100644
--- a/src/client/app/common/define-widget.ts
+++ b/src/client/app/common/define-widget.ts
@@ -60,9 +60,9 @@ export default function <T extends object>(data: {
 
 			save() {
 				if (this.platform == 'deck') {
-					this.$store.commit('device/updateDeckColumn', this.column);
+					this.$store.commit('updateDeckColumn', this.column);
 				} else {
-					this.$store.commit('device/updateWidget', this.widget);
+					this.$store.commit('updateWidget', this.widget);
 				}
 			}
 		}
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 094791a15..2d962aaaf 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -133,8 +133,8 @@
 
 			<section>
 				<header>{{ $t('@._settings.sync') }}</header>
-				<ui-input v-if="$root.isMobile" v-model="homeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
-				<ui-input v-else v-model="mobileHomeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-if="$root.isMobile" v-model="mobileHomeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-else v-model="homeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
 				<ui-input v-model="deckProfile">{{ $t('@._settings.deck-profile') }}</ui-input>
 			</section>
 
diff --git a/src/client/app/common/views/deck/deck.column.vue b/src/client/app/common/views/deck/deck.column.vue
index b09fdfbfe..b5c0896bb 100644
--- a/src/client/app/common/views/deck/deck.column.vue
+++ b/src/client/app/common/views/deck/deck.column.vue
@@ -180,50 +180,50 @@ export default Vue.extend({
 						}
 					}).then(({ canceled, result: name }) => {
 						if (canceled) return;
-						this.$store.commit('device/renameDeckColumn', { id: this.column.id, name });
+						this.$store.commit('renameDeckColumn', { id: this.column.id, name });
 					});
 				}
 			}, null, {
 				icon: 'arrow-left',
 				text: this.$t('swap-left'),
 				action: () => {
-					this.$store.commit('device/swapLeftDeckColumn', this.column.id);
+					this.$store.commit('swapLeftDeckColumn', this.column.id);
 				}
 			}, {
 				icon: 'arrow-right',
 				text: this.$t('swap-right'),
 				action: () => {
-					this.$store.commit('device/swapRightDeckColumn', this.column.id);
+					this.$store.commit('swapRightDeckColumn', this.column.id);
 				}
 			}, this.isStacked ? {
 				icon: faArrowUp,
 				text: this.$t('swap-up'),
 				action: () => {
-					this.$store.commit('device/swapUpDeckColumn', this.column.id);
+					this.$store.commit('swapUpDeckColumn', this.column.id);
 				}
 			} : undefined, this.isStacked ? {
 				icon: faArrowDown,
 				text: this.$t('swap-down'),
 				action: () => {
-					this.$store.commit('device/swapDownDeckColumn', this.column.id);
+					this.$store.commit('swapDownDeckColumn', this.column.id);
 				}
 			} : undefined, null, {
 				icon: ['far', 'window-restore'],
 				text: this.$t('stack-left'),
 				action: () => {
-					this.$store.commit('device/stackLeftDeckColumn', this.column.id);
+					this.$store.commit('stackLeftDeckColumn', this.column.id);
 				}
 			}, this.isStacked ? {
 				icon: faWindowMaximize,
 				text: this.$t('pop-right'),
 				action: () => {
-					this.$store.commit('device/popRightDeckColumn', this.column.id);
+					this.$store.commit('popRightDeckColumn', this.column.id);
 				}
 			} : undefined, null, {
 				icon: ['far', 'trash-alt'],
 				text: this.$t('remove'),
 				action: () => {
-					this.$store.commit('device/removeDeckColumn', this.column.id);
+					this.$store.commit('removeDeckColumn', this.column.id);
 				}
 			}];
 
@@ -307,7 +307,7 @@ export default Vue.extend({
 
 			const id = e.dataTransfer.getData('mk-deck-column');
 			if (id != null && id != '') {
-				this.$store.commit('device/swapDeckColumn', {
+				this.$store.commit('swapDeckColumn', {
 					a: this.column.id,
 					b: id
 				});
diff --git a/src/client/app/common/views/deck/deck.tl-column.vue b/src/client/app/common/views/deck/deck.tl-column.vue
index 5ab8ccb12..cad140ed5 100644
--- a/src/client/app/common/views/deck/deck.tl-column.vue
+++ b/src/client/app/common/views/deck/deck.tl-column.vue
@@ -90,7 +90,7 @@ export default Vue.extend({
 
 	methods: {
 		onChangeSettings(v) {
-			this.$store.commit('device/updateDeckColumn', this.column);
+			this.$store.commit('updateDeckColumn', this.column);
 		},
 
 		focus() {
diff --git a/src/client/app/common/views/deck/deck.vue b/src/client/app/common/views/deck/deck.vue
index e07e504ed..070312d83 100644
--- a/src/client/app/common/views/deck/deck.vue
+++ b/src/client/app/common/views/deck/deck.vue
@@ -32,11 +32,7 @@ export default Vue.extend({
 
 	computed: {
 		deck() {
-			if (this.$store.state.device.deckProfile) {
-				return this.$store.state.settings.deckProfiles[this.$store.state.device.deckProfile] || this.$store.state.device.deck;
-			} else {
-				return this.$store.state.device.deck;
-			}
+			return this.$store.getters.deck;
 		},
 
 		columns(): any[] {
@@ -115,14 +111,6 @@ export default Vue.extend({
 				value: deck
 			});
 		}
-
-		if (this.$store.state.device.deckProfile) {
-			this.$watch('$store.state.device.deck', () => {
-				this.$store.dispatch('settings/updateDeckProfile');
-			}, {
-				deep: true
-			});
-		}
 	},
 
 	mounted() {
@@ -146,7 +134,7 @@ export default Vue.extend({
 					icon: 'home',
 					text: this.$t('@deck.home'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'home'
 						});
@@ -155,7 +143,7 @@ export default Vue.extend({
 					icon: ['far', 'comments'],
 					text: this.$t('@deck.local'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'local'
 						});
@@ -164,7 +152,7 @@ export default Vue.extend({
 					icon: 'share-alt',
 					text: this.$t('@deck.hybrid'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'hybrid'
 						});
@@ -173,7 +161,7 @@ export default Vue.extend({
 					icon: 'globe',
 					text: this.$t('@deck.global'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'global'
 						});
@@ -182,7 +170,7 @@ export default Vue.extend({
 					icon: 'at',
 					text: this.$t('@deck.mentions'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'mentions'
 						});
@@ -191,7 +179,7 @@ export default Vue.extend({
 					icon: ['far', 'envelope'],
 					text: this.$t('@deck.direct'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'direct'
 						});
@@ -212,7 +200,7 @@ export default Vue.extend({
 							showCancelButton: true
 						});
 						if (canceled) return;
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'list',
 							list: lists.find(l => l.id === listId)
@@ -227,7 +215,7 @@ export default Vue.extend({
 							input: true
 						}).then(({ canceled, result: title }) => {
 							if (canceled) return;
-							this.$store.commit('device/addDeckColumn', {
+							this.$store.commit('addDeckColumn', {
 								id: uuid(),
 								type: 'hashtag',
 								tagTlId: this.$store.state.settings.tagTimelines.find(x => x.title == title).id
@@ -238,7 +226,7 @@ export default Vue.extend({
 					icon: ['far', 'bell'],
 					text: this.$t('@deck.notifications'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'notifications'
 						});
@@ -247,7 +235,7 @@ export default Vue.extend({
 					icon: 'calculator',
 					text: this.$t('@deck.widgets'),
 					action: () => {
-						this.$store.commit('device/addDeckColumn', {
+						this.$store.commit('addDeckColumn', {
 							id: uuid(),
 							type: 'widgets',
 							widgets: []
diff --git a/src/client/app/common/views/deck/deck.widgets-column.vue b/src/client/app/common/views/deck/deck.widgets-column.vue
index f2385c8a4..dd28a3a8b 100644
--- a/src/client/app/common/views/deck/deck.widgets-column.vue
+++ b/src/client/app/common/views/deck/deck.widgets-column.vue
@@ -110,7 +110,7 @@ export default Vue.extend({
 		},
 
 		addWidget() {
-			this.$store.commit('device/addDeckWidget', {
+			this.$store.commit('addDeckWidget', {
 				id: this.column.id,
 				widget: {
 					name: this.widgetAdderSelected,
@@ -123,14 +123,14 @@ export default Vue.extend({
 		},
 
 		removeWidget(widget) {
-			this.$store.commit('device/removeDeckWidget', {
+			this.$store.commit('removeDeckWidget', {
 				id: this.column.id,
 				widget
 			});
 		},
 
 		saveWidgets() {
-			this.$store.commit('device/updateDeckColumn', this.column);
+			this.$store.commit('updateDeckColumn', this.column);
 		}
 	}
 });
diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue
index 49ac4c240..3d05bee48 100644
--- a/src/client/app/desktop/views/home/home.vue
+++ b/src/client/app/desktop/views/home/home.vue
@@ -84,6 +84,7 @@ import XWelcome from '../pages/welcome.vue';
 
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/home.vue'),
+
 	components: {
 		XDraggable,
 		XWelcome
@@ -102,11 +103,7 @@ export default Vue.extend({
 	computed: {
 		home(): any[] {
 			if (this.$store.getters.isSignedIn) {
-				if (this.$store.state.device.homeProfile) {
-					return this.$store.state.settings.homeProfiles[this.$store.state.device.homeProfile] || this.$store.state.device.home || [];
-				} else {
-					return this.$store.state.device.home || [];
-				}
+				return this.$store.getters.home || [];
 			} else {
 				return [{
 					name: 'instance',
@@ -142,7 +139,9 @@ export default Vue.extend({
 	},
 
 	created() {
-		if (this.$store.getters.isSignedIn) {
+		if (!this.$store.getters.isSignedIn) return;
+
+		if (this.$store.getters.home == null) {
 			const defaultDesktopHomeWidgets = {
 				left: [
 					'profile',
@@ -187,17 +186,7 @@ export default Vue.extend({
 			}
 			//#endregion
 
-			if (this.$store.state.device.home == null) {
-				this.$store.commit('device/setHome', _defaultDesktopHomeWidgets);
-			}
-
-			if (this.$store.state.device.homeProfile) {
-				this.$watch('$store.state.device.home', () => {
-					this.$store.dispatch('settings/updateHomeProfile');
-				}, {
-					deep: true
-				});
-			}
+			this.$store.commit('setHome', _defaultDesktopHomeWidgets);
 		}
 	},
 
@@ -235,7 +224,7 @@ export default Vue.extend({
 		},
 
 		addWidget() {
-			this.$store.commit('device/addHomeWidget', {
+			this.$store.commit('addHomeWidget', {
 				name: this.widgetAdderSelected,
 				id: uuid(),
 				place: 'left',
@@ -246,7 +235,7 @@ export default Vue.extend({
 		saveHome() {
 			const left = this.widgets.left;
 			const right = this.widgets.right;
-			this.$store.commit('device/setHome', left.concat(right));
+			this.$store.commit('setHome', left.concat(right));
 			for (const w of left) w.place = 'left';
 			for (const w of right) w.place = 'right';
 		},
diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue
index 7f0ef678d..c012de131 100644
--- a/src/client/app/mobile/views/pages/widgets.vue
+++ b/src/client/app/mobile/views/pages/widgets.vue
@@ -72,17 +72,13 @@ export default Vue.extend({
 
 	computed: {
 		widgets(): any[] {
-			if (this.$store.state.device.mobileHomeProfile) {
-				return this.$store.state.settings.mobileHomeProfiles[this.$store.state.device.mobileHomeProfile] || this.$store.state.device.mobileHome;
-			} else {
-				return this.$store.state.device.mobileHome;
-			}
+			return this.$store.getters.mobileHome || [];
 		}
 	},
 
 	created() {
 		if (this.widgets.length == 0) {
-			this.$store.commit('device/setMobileHome', [{
+			this.$store.commit('setMobileHome', [{
 				name: 'calendar',
 				id: 'a', data: {}
 			}, {
@@ -103,13 +99,11 @@ export default Vue.extend({
 			}]);
 		}
 
-		if (this.$store.state.device.mobileHomeProfile) {
-			this.$watch('$store.state.device.mobileHome', () => {
-				this.$store.dispatch('settings/updateMobileHomeProfile');
-			}, {
-				deep: true
-			});
-		}
+		this.$watch('$store.getters.mobileHome', () => {
+			this.$store.dispatch('settings/updateMobileHomeProfile');
+		}, {
+			deep: true
+		});
 	},
 
 	mounted() {
@@ -134,7 +128,7 @@ export default Vue.extend({
 		},
 
 		addWidget() {
-			this.$store.commit('device/addMobileHomeWidget', {
+			this.$store.commit('addMobileHomeWidget', {
 				name: this.widgetAdderSelected,
 				id: uuid(),
 				data: {}
@@ -142,11 +136,11 @@ export default Vue.extend({
 		},
 
 		removeWidget(widget) {
-			this.$store.commit('device/removeMobileHomeWidget', widget);
+			this.$store.commit('removeMobileHomeWidget', widget);
 		},
 
 		saveHome() {
-			this.$store.commit('device/setMobileHome', this.widgets);
+			this.$store.commit('setMobileHome', this.widgets);
 		}
 	}
 });
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 4a6e1a610..b06edb1ed 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import Vuex from 'vuex';
 import createPersistedState from 'vuex-persistedstate';
 import * as nestedProperty from 'nested-property';
@@ -40,12 +41,9 @@ const defaultSettings = {
 };
 
 const defaultDeviceSettings = {
-	home: null,
-	homeProfile: null,
-	mobileHomeProfile: null,
-	mobileHome: [],
-	deck: null,
-	deckProfile: null,
+	homeProfile: 'Default',
+	mobileHomeProfile: 'Default',
+	deckProfile: 'Default',
 	deckMode: false,
 	deckColumnAlign: 'center',
 	deckColumnWidth: 'normal',
@@ -88,7 +86,13 @@ export default (os: MiOS) => new Vuex.Store({
 	},
 
 	getters: {
-		isSignedIn: state => state.i != null
+		isSignedIn: state => state.i != null,
+
+		home: state => state.settings.homeProfiles[state.device.homeProfile],
+
+		mobileHome: state => state.settings.mobileHomeProfiles[state.device.mobileHomeProfile],
+
+		deck: state => state.settings.deckProfiles[state.device.deckProfile],
 	},
 
 	mutations: {
@@ -118,6 +122,211 @@ export default (os: MiOS) => new Vuex.Store({
 		clearBehindNotes(state) {
 			state.behindNotes = [];
 			document.title = os.instanceName;
+		},
+
+		setHome(state, data) {
+			Vue.set(state.settings.homeProfiles, state.device.homeProfile, data);
+			os.store.dispatch('settings/updateHomeProfile');
+		},
+
+		addHomeWidget(state, widget) {
+			state.settings.homeProfiles[state.device.homeProfile].unshift(widget);
+			os.store.dispatch('settings/updateHomeProfile');
+		},
+
+		setMobileHome(state, data) {
+			Vue.set(state.settings.mobileHomeProfiles, state.device.mobileHomeProfile, data);
+			os.store.dispatch('settings/updateMobileHomeProfile');
+		},
+
+		updateWidget(state, x) {
+			let w;
+
+			//#region Desktop home
+			const home = state.settings.homeProfiles[state.device.homeProfile];
+			if (home) {
+				w = home.find(w => w.id == x.id);
+				if (w) {
+					w.data = x.data;
+					os.store.dispatch('settings/updateHomeProfile');
+				}
+			}
+			//#endregion
+
+			//#region Mobile home
+			const mobileHome = state.settings.mobileHomeProfiles[state.device.mobileHomeProfile];
+			if (mobileHome) {
+				w = mobileHome.find(w => w.id == x.id);
+				if (w) {
+					w.data = x.data;
+					os.store.dispatch('settings/updateMobileHomeProfile');
+				}
+			}
+			//#endregion
+		},
+
+		addMobileHomeWidget(state, widget) {
+			state.settings.mobileHomeProfiles[state.device.mobileHomeProfile].unshift(widget);
+			os.store.dispatch('settings/updateMobileHomeProfile');
+		},
+
+		removeMobileHomeWidget(state, widget) {
+			Vue.set('state.settings.mobileHomeProfiles', state.device.mobileHomeProfile, state.settings.mobileHomeProfiles[state.device.mobileHomeProfile].filter(w => w.id != widget.id));
+			os.store.dispatch('settings/updateMobileHomeProfile');
+		},
+
+		addDeckColumn(state, column) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			if (column.name == undefined) column.name = null;
+			deck.columns.push(column);
+			deck.layout.push([column.id]);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		removeDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			deck.columns = deck.columns.filter(c => c.id != id);
+			deck.layout = deck.layout.map(ids => erase(id, ids));
+			deck.layout = deck.layout.filter(ids => ids.length > 0);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		swapDeckColumn(state, x) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const a = x.a;
+			const b = x.b;
+			const aX = deck.layout.findIndex(ids => ids.indexOf(a) != -1);
+			const aY = deck.layout[aX].findIndex(id => id == a);
+			const bX = deck.layout.findIndex(ids => ids.indexOf(b) != -1);
+			const bY = deck.layout[bX].findIndex(id => id == b);
+			deck.layout[aX][aY] = b;
+			deck.layout[bX][bY] = a;
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		swapLeftDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			deck.layout.some((ids, i) => {
+				if (ids.indexOf(id) != -1) {
+					const left = deck.layout[i - 1];
+					if (left) {
+						// https://vuejs.org/v2/guide/list.html#Caveats
+						//state.deck.layout[i - 1] = state.deck.layout[i];
+						//state.deck.layout[i] = left;
+						deck.layout.splice(i - 1, 1, deck.layout[i]);
+						deck.layout.splice(i, 1, left);
+					}
+					return true;
+				}
+			});
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		swapRightDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			deck.layout.some((ids, i) => {
+				if (ids.indexOf(id) != -1) {
+					const right = deck.layout[i + 1];
+					if (right) {
+						// https://vuejs.org/v2/guide/list.html#Caveats
+						//state.deck.layout[i + 1] = state.deck.layout[i];
+						//state.deck.layout[i] = right;
+						deck.layout.splice(i + 1, 1, deck.layout[i]);
+						deck.layout.splice(i, 1, right);
+					}
+					return true;
+				}
+			});
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		swapUpDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const ids = deck.layout.find(ids => ids.indexOf(id) != -1);
+			ids.some((x, i) => {
+				if (x == id) {
+					const up = ids[i - 1];
+					if (up) {
+						// https://vuejs.org/v2/guide/list.html#Caveats
+						//ids[i - 1] = id;
+						//ids[i] = up;
+						ids.splice(i - 1, 1, id);
+						ids.splice(i, 1, up);
+					}
+					return true;
+				}
+			});
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		swapDownDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const ids = deck.layout.find(ids => ids.indexOf(id) != -1);
+			ids.some((x, i) => {
+				if (x == id) {
+					const down = ids[i + 1];
+					if (down) {
+						// https://vuejs.org/v2/guide/list.html#Caveats
+						//ids[i + 1] = id;
+						//ids[i] = down;
+						ids.splice(i + 1, 1, id);
+						ids.splice(i, 1, down);
+					}
+					return true;
+				}
+			});
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		stackLeftDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const i = deck.layout.findIndex(ids => ids.indexOf(id) != -1);
+			deck.layout = deck.layout.map(ids => erase(id, ids));
+			const left = deck.layout[i - 1];
+			if (left) deck.layout[i - 1].push(id);
+			deck.layout = deck.layout.filter(ids => ids.length > 0);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		popRightDeckColumn(state, id) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const i = deck.layout.findIndex(ids => ids.indexOf(id) != -1);
+			deck.layout = deck.layout.map(ids => erase(id, ids));
+			deck.layout.splice(i + 1, 0, [id]);
+			deck.layout = deck.layout.filter(ids => ids.length > 0);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		addDeckWidget(state, x) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const column = deck.columns.find(c => c.id == x.id);
+			if (column == null) return;
+			column.widgets.unshift(x.widget);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		removeDeckWidget(state, x) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const column = deck.columns.find(c => c.id == x.id);
+			if (column == null) return;
+			column.widgets = column.widgets.filter(w => w.id != x.widget.id);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		renameDeckColumn(state, x) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			const column = deck.columns.find(c => c.id == x.id);
+			if (column == null) return;
+			column.name = x.name;
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
+		updateDeckColumn(state, x) {
+			const deck = state.settings.deckProfiles[state.device.deckProfile];
+			let column = deck.columns.find(c => c.id == x.id);
+			if (column == null) return;
+			column = x;
+			os.store.dispatch('settings/updateDeckProfile');
 		}
 	},
 
@@ -165,176 +374,6 @@ export default (os: MiOS) => new Vuex.Store({
 				setVisibility(state, visibility) {
 					state.visibility = visibility;
 				},
-
-				setHome(state, data) {
-					state.home = data;
-				},
-
-				addHomeWidget(state, widget) {
-					state.home.unshift(widget);
-				},
-
-				setMobileHome(state, data) {
-					state.mobileHome = data;
-				},
-
-				updateWidget(state, x) {
-					let w;
-
-					//#region Desktop home
-					if (state.home) {
-						w = state.home.find(w => w.id == x.id);
-						if (w) {
-							w.data = x.data;
-						}
-					}
-					//#endregion
-
-					//#region Mobile home
-					if (state.mobileHome) {
-						w = state.mobileHome.find(w => w.id == x.id);
-						if (w) {
-							w.data = x.data;
-						}
-					}
-					//#endregion
-				},
-
-				addMobileHomeWidget(state, widget) {
-					state.mobileHome.unshift(widget);
-				},
-
-				removeMobileHomeWidget(state, widget) {
-					state.mobileHome = state.mobileHome.filter(w => w.id != widget.id);
-				},
-
-				addDeckColumn(state, column) {
-					if (column.name == undefined) column.name = null;
-					state.deck.columns.push(column);
-					state.deck.layout.push([column.id]);
-				},
-
-				removeDeckColumn(state, id) {
-					state.deck.columns = state.deck.columns.filter(c => c.id != id);
-					state.deck.layout = state.deck.layout.map(ids => erase(id, ids));
-					state.deck.layout = state.deck.layout.filter(ids => ids.length > 0);
-				},
-
-				swapDeckColumn(state, x) {
-					const a = x.a;
-					const b = x.b;
-					const aX = state.deck.layout.findIndex(ids => ids.indexOf(a) != -1);
-					const aY = state.deck.layout[aX].findIndex(id => id == a);
-					const bX = state.deck.layout.findIndex(ids => ids.indexOf(b) != -1);
-					const bY = state.deck.layout[bX].findIndex(id => id == b);
-					state.deck.layout[aX][aY] = b;
-					state.deck.layout[bX][bY] = a;
-				},
-
-				swapLeftDeckColumn(state, id) {
-					state.deck.layout.some((ids, i) => {
-						if (ids.indexOf(id) != -1) {
-							const left = state.deck.layout[i - 1];
-							if (left) {
-								// https://vuejs.org/v2/guide/list.html#Caveats
-								//state.deck.layout[i - 1] = state.deck.layout[i];
-								//state.deck.layout[i] = left;
-								state.deck.layout.splice(i - 1, 1, state.deck.layout[i]);
-								state.deck.layout.splice(i, 1, left);
-							}
-							return true;
-						}
-					});
-				},
-
-				swapRightDeckColumn(state, id) {
-					state.deck.layout.some((ids, i) => {
-						if (ids.indexOf(id) != -1) {
-							const right = state.deck.layout[i + 1];
-							if (right) {
-								// https://vuejs.org/v2/guide/list.html#Caveats
-								//state.deck.layout[i + 1] = state.deck.layout[i];
-								//state.deck.layout[i] = right;
-								state.deck.layout.splice(i + 1, 1, state.deck.layout[i]);
-								state.deck.layout.splice(i, 1, right);
-							}
-							return true;
-						}
-					});
-				},
-
-				swapUpDeckColumn(state, id) {
-					const ids = state.deck.layout.find(ids => ids.indexOf(id) != -1);
-					ids.some((x, i) => {
-						if (x == id) {
-							const up = ids[i - 1];
-							if (up) {
-								// https://vuejs.org/v2/guide/list.html#Caveats
-								//ids[i - 1] = id;
-								//ids[i] = up;
-								ids.splice(i - 1, 1, id);
-								ids.splice(i, 1, up);
-							}
-							return true;
-						}
-					});
-				},
-
-				swapDownDeckColumn(state, id) {
-					const ids = state.deck.layout.find(ids => ids.indexOf(id) != -1);
-					ids.some((x, i) => {
-						if (x == id) {
-							const down = ids[i + 1];
-							if (down) {
-								// https://vuejs.org/v2/guide/list.html#Caveats
-								//ids[i + 1] = id;
-								//ids[i] = down;
-								ids.splice(i + 1, 1, id);
-								ids.splice(i, 1, down);
-							}
-							return true;
-						}
-					});
-				},
-
-				stackLeftDeckColumn(state, id) {
-					const i = state.deck.layout.findIndex(ids => ids.indexOf(id) != -1);
-					state.deck.layout = state.deck.layout.map(ids => erase(id, ids));
-					const left = state.deck.layout[i - 1];
-					if (left) state.deck.layout[i - 1].push(id);
-					state.deck.layout = state.deck.layout.filter(ids => ids.length > 0);
-				},
-
-				popRightDeckColumn(state, id) {
-					const i = state.deck.layout.findIndex(ids => ids.indexOf(id) != -1);
-					state.deck.layout = state.deck.layout.map(ids => erase(id, ids));
-					state.deck.layout.splice(i + 1, 0, [id]);
-					state.deck.layout = state.deck.layout.filter(ids => ids.length > 0);
-				},
-
-				addDeckWidget(state, x) {
-					const column = state.deck.columns.find(c => c.id == x.id);
-					if (column == null) return;
-					column.widgets.unshift(x.widget);
-				},
-
-				removeDeckWidget(state, x) {
-					const column = state.deck.columns.find(c => c.id == x.id);
-					if (column == null) return;
-					column.widgets = column.widgets.filter(w => w.id != x.widget.id);
-				},
-
-				renameDeckColumn(state, x) {
-					const column = state.deck.columns.find(c => c.id == x.id);
-					if (column == null) return;
-					column.name = x.name;
-				},
-
-				updateDeckColumn(state, x) {
-					let column = state.deck.columns.find(c => c.id == x.id);
-					if (column == null) return;
-					column = x;
-				}
 			}
 		},
 
@@ -370,7 +409,6 @@ export default (os: MiOS) => new Vuex.Store({
 
 				updateHomeProfile(ctx) {
 					const profiles = ctx.state.homeProfiles;
-					profiles[ctx.rootState.device.homeProfile] = ctx.rootState.device.home;
 					ctx.commit('set', {
 						key: 'homeProfiles',
 						value: profiles
@@ -383,7 +421,6 @@ export default (os: MiOS) => new Vuex.Store({
 
 				updateMobileHomeProfile(ctx) {
 					const profiles = ctx.state.mobileHomeProfiles;
-					profiles[ctx.rootState.device.mobileHomeProfile] = ctx.rootState.device.mobileHome;
 					ctx.commit('set', {
 						key: 'mobileHomeProfiles',
 						value: profiles
@@ -396,7 +433,6 @@ export default (os: MiOS) => new Vuex.Store({
 
 				updateDeckProfile(ctx) {
 					const profiles = ctx.state.deckProfiles;
-					profiles[ctx.rootState.device.deckProfile] = ctx.rootState.device.deck;
 					ctx.commit('set', {
 						key: 'deckProfiles',
 						value: profiles

From fa0023e54168624bebd6cdd479c1df0e63cb868d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 21 Jun 2019 15:11:56 +0900
Subject: [PATCH 08/15] Fix bug

---
 src/client/app/common/views/deck/deck.vue | 5 +----
 src/client/app/store.ts                   | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client/app/common/views/deck/deck.vue b/src/client/app/common/views/deck/deck.vue
index 070312d83..36e0f8161 100644
--- a/src/client/app/common/views/deck/deck.vue
+++ b/src/client/app/common/views/deck/deck.vue
@@ -106,10 +106,7 @@ export default Vue.extend({
 
 			deck.layout = deck.columns.map(c => [c.id]);
 
-			this.$store.commit('device/set', {
-				key: 'deck',
-				value: deck
-			});
+			this.$store.commit('setDeck', deck);
 		}
 	},
 
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index b06edb1ed..852d2c393 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -129,6 +129,11 @@ export default (os: MiOS) => new Vuex.Store({
 			os.store.dispatch('settings/updateHomeProfile');
 		},
 
+		setDeck(state, data) {
+			Vue.set(state.settings.deckProfiles, state.device.deckProfile, data);
+			os.store.dispatch('settings/updateDeckProfile');
+		},
+
 		addHomeWidget(state, widget) {
 			state.settings.homeProfiles[state.device.homeProfile].unshift(widget);
 			os.store.dispatch('settings/updateHomeProfile');

From 16b03fc157507261c54e5bb0eb030dcf6418a68c Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 21 Jun 2019 15:41:02 +0900
Subject: [PATCH 09/15] Improve url-preview (#5077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* url-previewリクエスト時にハッシュは除く

* ハッシュだけ違うプレビューカードは表示しない

*  url-previewをユーザーロケールで出し分けるように

* Fix code style
---
 src/client/app/common/scripts/note-mixin.ts   | 12 +++++++++++-
 .../common/views/components/url-preview.vue   | 19 ++++++++++++-------
 src/server/web/url-preview.ts                 | 10 ++++++----
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index 4b454f880..e64968007 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -83,9 +83,19 @@ export default (opts: Opts = {}) => ({
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
 				// TODO: 再帰的にURL要素がないか調べる
-				return unique(ast
+				const urls = unique(ast
 					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
 					.map(t => t.node.props.url));
+
+				// unique without hash
+				// [ http://a/#1, http://a/#2, http://b/#3 ] => [ http://a/#1, http://b/#3 ]
+				const removeHash = x => x.replace(/#[^#]*$/, '');
+
+				return urls.reduce((array, url) => {
+					const removed = removeHash(url);
+					if (!array.map(x => removeHash(x)).includes(removed)) array.push(url);
+					return array;
+				}, []);
 			} else {
 				return null;
 			}
diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue
index 9c61e4605..20fbcbb04 100644
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -30,7 +30,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { url as local } from '../../../config';
+import { url as local, lang } from '../../../config';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/url-preview.vue'),
@@ -89,10 +89,10 @@ export default Vue.extend({
 	},
 
 	created() {
-		const url = new URL(this.url);
+		const requestUrl = new URL(this.url);
 
-		if (this.detail && url.hostname == 'twitter.com' && /^\/.+\/status(es)?\/\d+/.test(url.pathname)) {
-			this.tweetUrl = url;
+		if (this.detail && requestUrl.hostname == 'twitter.com' && /^\/.+\/status(es)?\/\d+/.test(requestUrl.pathname)) {
+			this.tweetUrl = requestUrl;
 			const twttr = (window as any).twttr || {};
 			const loadTweet = () => twttr.widgets.load(this.$refs.tweet);
 
@@ -113,10 +113,15 @@ export default Vue.extend({
 			return;
 		}
 
-		if (url.hostname === 'music.youtube.com')
-			url.hostname = 'youtube.com';
+		if (requestUrl.hostname === 'music.youtube.com') {
+			requestUrl.hostname = 'youtube.com';
+		}
 
-		fetch(`/url?url=${encodeURIComponent(this.url)}`).then(res => {
+		const requestLang = (lang || 'ja-JP').replace('ja-KS', 'ja-JP');
+
+		requestUrl.hash = '';
+
+		fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${requestLang}`).then(res => {
 			res.json().then(info => {
 				if (info.url == null) return;
 				this.title = info.title;
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index e5b9ff624..310cf88c0 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -12,18 +12,20 @@ module.exports = async (ctx: Koa.BaseContext) => {
 	const meta = await fetchMeta();
 
 	logger.info(meta.summalyProxy
-		? `(Proxy) Getting preview of ${ctx.query.url} ...`
-		: `Getting preview of ${ctx.query.url} ...`);
+		? `(Proxy) Getting preview of ${ctx.query.url}@${ctx.query.lang} ...`
+		: `Getting preview of ${ctx.query.url}@${ctx.query.lang} ...`);
 
 	try {
 		const summary = meta.summalyProxy ? await request.get({
 			url: meta.summalyProxy,
 			qs: {
-				url: ctx.query.url
+				url: ctx.query.url,
+				lang: ctx.query.lang || 'ja-JP'
 			},
 			json: true
 		}) : await summaly(ctx.query.url, {
-			followRedirects: false
+			followRedirects: false,
+			lang: ctx.query.lang || 'ja-JP'
 		});
 
 		logger.succ(`Got preview of ${ctx.query.url}: ${summary.title}`);

From 1707002d430e339ce21d1b806d1b8cd5ce76aba6 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 21 Jun 2019 15:42:07 +0900
Subject: [PATCH 10/15] Block all activities from suspended users (#5076)

---
 src/remote/activitypub/kernel/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts
index d1251817f..a0646bdd6 100644
--- a/src/remote/activitypub/kernel/index.ts
+++ b/src/remote/activitypub/kernel/index.ts
@@ -15,6 +15,8 @@ import block from './block';
 import { apLogger } from '../logger';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
+	if (actor.isSuspended) return;
+
 	switch (activity.type) {
 	case 'Create':
 		await create(actor, activity);

From 8409b59deafeb18828c763ac7288f53be36d0790 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 22 Jun 2019 04:09:53 +0900
Subject: [PATCH 11/15] Improve usability

---
 .../app/common/views/components/settings/settings.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 2d962aaaf..1254eb5e5 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -133,9 +133,9 @@
 
 			<section>
 				<header>{{ $t('@._settings.sync') }}</header>
-				<ui-input v-if="$root.isMobile" v-model="mobileHomeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
-				<ui-input v-else v-model="homeProfile">{{ $t('@._settings.home-profile') }}</ui-input>
-				<ui-input v-model="deckProfile">{{ $t('@._settings.deck-profile') }}</ui-input>
+				<ui-input v-if="$root.isMobile" v-model="mobileHomeProfile" :datalist="Object.keys($store.state.settings.mobileHomeProfiles)">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-else v-model="homeProfile" :datalist="Object.keys($store.state.settings.homeProfiles)">{{ $t('@._settings.home-profile') }}</ui-input>
+				<ui-input v-model="deckProfile" :datalist="Object.keys($store.state.settings.deckProfiles)">{{ $t('@._settings.deck-profile') }}</ui-input>
 			</section>
 
 			<section>

From 89f16668e6f925acd81e51002864be145cf27ce9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 22 Jun 2019 04:17:02 +0900
Subject: [PATCH 12/15] Fix #4519

---
 src/services/following/delete.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/following/delete.ts b/src/services/following/delete.ts
index ad09f0e6d..e3b5f8c41 100644
--- a/src/services/following/delete.ts
+++ b/src/services/following/delete.ts
@@ -22,7 +22,7 @@ export default async function(follower: User, followee: User, silent = false) {
 		return;
 	}
 
-	Followings.delete(following.id);
+	await Followings.delete(following.id);
 
 	//#region Decrement following count
 	Users.decrement({ id: follower.id }, 'followingCount', 1);

From bb4ca7b31ad81b92651c81203fa74c1c8e4cbd87 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 23 Jun 2019 00:06:39 +0900
Subject: [PATCH 13/15] Resolve #5010

---
 locales/ja-JP.yml              | 3 +++
 src/misc/aiscript/evaluator.ts | 1 +
 src/misc/aiscript/index.ts     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 47e1d4d93..88673e804 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2151,6 +2151,9 @@ pages:
       _pick:
         arg1: "リスト"
         arg2: "位置"
+      listLen: "リストの長さを取得"
+      _listLen:
+        arg1: "リスト"
       number: "数値"
       stringToNumber: "テキストを数値に"
       _stringToNumber:
diff --git a/src/misc/aiscript/evaluator.ts b/src/misc/aiscript/evaluator.ts
index d93fcebcf..f6165afb6 100644
--- a/src/misc/aiscript/evaluator.ts
+++ b/src/misc/aiscript/evaluator.ts
@@ -171,6 +171,7 @@ export class ASEvaluator {
 			numberToString: (a: number) => a.toString(),
 			splitStrByLine: (a: string) => a.split('\n'),
 			pick: (list: any[], i: number) => list[i - 1],
+			listLen: (list: any[]) => list.length,
 			random: (probability: number) => Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * 100) < probability,
 			rannum: (min: number, max: number) => min + Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * (max - min + 1)),
 			randomPick: (list: any[]) => list[Math.floor(seedrandom(`${this.opts.randomSeed}:${block.id}`)() * list.length)],
diff --git a/src/misc/aiscript/index.ts b/src/misc/aiscript/index.ts
index 8635399da..3a21e9b1c 100644
--- a/src/misc/aiscript/index.ts
+++ b/src/misc/aiscript/index.ts
@@ -74,6 +74,7 @@ export const funcDefs: Record<string, { in: any[]; out: any; category: string; i
 	numberToString:  { in: ['number'],                     out: 'string',      category: 'convert',    icon: faExchangeAlt, },
 	splitStrByLine:  { in: ['string'],                     out: 'stringArray', category: 'convert',    icon: faExchangeAlt, },
 	pick:            { in: [null, 'number'],               out: null,          category: 'list',       icon: faIndent, },
+	listLen:         { in: [null],                         out: 'number',      category: 'list',       icon: faIndent, },
 	rannum:          { in: ['number', 'number'],           out: 'number',      category: 'random',     icon: faDice, },
 	dailyRannum:     { in: ['number', 'number'],           out: 'number',      category: 'random',     icon: faDice, },
 	seedRannum:      { in: [null, 'number', 'number'],     out: 'number',      category: 'random',     icon: faDice, },

From 9bdc67c1f6359ee896d017cd83af18cf19ab1c90 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 23 Jun 2019 00:21:04 +0900
Subject: [PATCH 14/15] New Crowdin translations (#5065)

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

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

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

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

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

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Czech)

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

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)
---
 locales/cs-CZ.yml |  2 ++
 locales/da-DK.yml |  2 ++
 locales/de-DE.yml |  2 ++
 locales/en-US.yml |  8 ++++++++
 locales/es-ES.yml |  2 ++
 locales/fr-FR.yml |  7 +++++++
 locales/ja-KS.yml |  2 ++
 locales/ko-KR.yml | 14 +++++++++++---
 locales/nl-NL.yml |  2 ++
 locales/no-NO.yml |  2 ++
 locales/pl-PL.yml |  2 ++
 locales/ru-RU.yml | 14 ++++++++++++++
 locales/zh-CN.yml | 14 +++++++++++---
 13 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 29395ecfd..ff7b730c2 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -1298,5 +1298,7 @@ pages:
         arg2: "Seznamy"
       _pick:
         arg1: "Seznamy"
+      _listLen:
+        arg1: "Seznamy"
     types:
       array: "Seznamy"
diff --git a/locales/da-DK.yml b/locales/da-DK.yml
index 08ca17592..3b667258f 100644
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -1844,6 +1844,8 @@ pages:
       _pick:
         arg1: "Lister"
         arg2: "Position"
+      _listLen:
+        arg1: "Lister"
       number: "Tal"
       stringToNumber: "Tekst til tal"
       _stringToNumber:
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index bc6515cd5..2541e1ca6 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -929,5 +929,7 @@ pages:
         arg2: "Listen"
       _pick:
         arg1: "Listen"
+      _listLen:
+        arg1: "Listen"
     types:
       array: "Listen"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5ac2561d1..fd8e96588 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -270,6 +270,9 @@ common:
     disable-via-mobile: "Don't mark the post as 'from mobile'"
     load-raw-images: "Show attached images in original quality"
     load-remote-media: "Show media from a remote server"
+    sync: "Sync"
+    home-profile: "Home profile"
+    deck-profile: "Deck profile"
   search: "Search"
   delete: "Delete"
   loading: "Loading"
@@ -1103,7 +1106,10 @@ admin/views/index.vue:
   abuse: "Abuse"
   queue: "Job Queue"
   logs: "Logs"
+  db: "Database"
   back-to-misskey: "Back to Misskey"
+admin/views/db.vue:
+  tables: "Tables"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "Accounts"
@@ -1941,6 +1947,8 @@ pages:
       _pick:
         arg1: "Lists"
         arg2: "Position"
+      _listLen:
+        arg1: "Lists"
       number: "Number"
       stringToNumber: "Text to number"
       _stringToNumber:
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index bbfa7f10e..174b69110 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1109,5 +1109,7 @@ pages:
         arg2: "Listas"
       _pick:
         arg1: "Listas"
+      _listLen:
+        arg1: "Listas"
     types:
       array: "Listas"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 100b2f912..fe593c24f 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -265,6 +265,7 @@ common:
     disable-via-mobile: "Enlever la mention publié via 'mobile'"
     load-raw-images: "Afficher les photos jointes dans leur qualité originale"
     load-remote-media: "Afficher les médias depuis le serveur distant"
+    sync: "Synchroniser"
   search: "Recherche"
   delete: "Supprimer"
   loading: "Chargement en cours …"
@@ -724,6 +725,7 @@ common/views/components/user-group-editor.vue:
   transfer: "Transférer de groupe"
   transferred: "Groupe transféré"
   remove-user: "Enlever un utilisateur de ce groupe"
+  delete-are-you-sure: "Désirez-vous vraiment supprimer le groupe $1 ?"
   deleted: "Supprimé"
   invite: "Inviter"
   invited: "Invitation envoyée avec succès"
@@ -1088,7 +1090,10 @@ admin/views/index.vue:
   abuse: "Abus"
   queue: "File d’attente"
   logs: "Journaux"
+  db: "Base de données"
   back-to-misskey: "Retour vers Misskey"
+admin/views/db.vue:
+  tables: "Tables"
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
   accounts: "Comptes"
@@ -1875,6 +1880,8 @@ pages:
       _pick:
         arg1: "Listes"
         arg2: "Position"
+      _listLen:
+        arg1: "Listes"
       number: "Numérique"
       stringToNumber: "Chaîne en chiffres"
       _stringToNumber:
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 8f6fc1896..85ad415d7 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1254,5 +1254,7 @@ pages:
         arg2: "リスト"
       _pick:
         arg1: "リスト"
+      _listLen:
+        arg1: "リスト"
     types:
       array: "リスト"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 72070e4d4..5272973ec 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -116,7 +116,7 @@ common:
     local-only-message: "이 글은 로컬에만 공개되어 있습니다"
     click-to-tagging: "클릭하여 태그 넣기"
     visibility: "공개 범위"
-    geolocation-alert: "사용 중인 장치에서는 위치 정보를 사용할 수 없습니다"
+    geolocation-alert: "사용 중이신 장치에서는 위치 정보를 사용할 수 없습니다"
     error: "오류"
     enter-username: "사용자명을 입력해주세요"
     add-visible-user: "사용자 추가"
@@ -270,6 +270,9 @@ common:
     disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
     load-raw-images: "첨부 이미지를 고품질로 표시"
     load-remote-media: "원격 서버의 미디어를 표시"
+    sync: "동기화"
+    home-profile: "홈 프로필"
+    deck-profile: "덱 프로필"
   search: "검색"
   delete: "삭제"
   loading: "로드 중"
@@ -286,7 +289,7 @@ common:
   is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다."
   is-remote-post: "이 글 정보는 복사본입니다."
   view-on-remote: "정확한 정보 보기"
-  renoted-by: "{user}이(가) 리노트"
+  renoted-by: "{user}님이 리노트"
   no-notes: "글이 없습니다"
   turn-on-darkmode: "어둠에 삼켜져라"
   turn-off-darkmode: "빛이 있으라"
@@ -1103,7 +1106,10 @@ admin/views/index.vue:
   abuse: "스팸 신고"
   queue: "작업 대기열"
   logs: "로그"
+  db: "데이터베이스"
   back-to-misskey: "Misskey로 돌아가기"
+admin/views/db.vue:
+  tables: "테이블"
 admin/views/dashboard.vue:
   dashboard: "대시보드"
   accounts: "계정"
@@ -1126,7 +1132,7 @@ admin/views/queue.vue:
   states:
     active: "처리중"
     delayed: "지연됨"
-    waiting: "대기열에 들어감"
+    waiting: "대기열에 있음"
   result-is-truncated: "결과는 생략되었습니다"
   other-queues: "기타 큐"
 admin/views/logs.vue:
@@ -1941,6 +1947,8 @@ pages:
       _pick:
         arg1: "리스트"
         arg2: "위치"
+      _listLen:
+        arg1: "리스트"
       number: "수치"
       stringToNumber: "텍스트를 수치로"
       _stringToNumber:
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 857a00ca9..355b3cb68 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -623,5 +623,7 @@ pages:
         arg2: "Lijsten"
       _pick:
         arg1: "Lijsten"
+      _listLen:
+        arg1: "Lijsten"
     types:
       array: "Lijsten"
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index c42b54baa..296c0ccca 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -503,5 +503,7 @@ pages:
         arg2: "Lister"
       _pick:
         arg1: "Lister"
+      _listLen:
+        arg1: "Lister"
     types:
       array: "Lister"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index eecde5c73..e7a34c4ac 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1219,5 +1219,7 @@ pages:
         arg2: "Listy"
       _pick:
         arg1: "Listy"
+      _listLen:
+        arg1: "Listy"
     types:
       array: "Listy"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 002e3bfab..01450b956 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -26,6 +26,13 @@ common:
   do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
   load-more: "Загрузить больше"
   enter-password: "Пожалуйста, введите ваш пароль"
+  2fa: "Двухфакторная аутентификация"
+  customize-home: "Настройка домашней страницы"
+  dark-mode: "Тёмная тема"
+  signin: "Войти"
+  signup: "Регистрация"
+  signout: "Выйти"
+  reload-to-apply-the-setting: "Вам необходимо перезагрузить страницу, чтобы применить настройки. Вы хотите перезагрузить сейчас?"
   customization-tips:
     title: "Советы по настройке"
     gotit: "Понятно!"
@@ -51,7 +58,14 @@ common:
   month-and-day: "{day}.{month}"
   trash: "Мусорное ведро"
   drive: "Drive"
+  pages: "Страницы"
   messaging: "Чат"
+  timeline: "Лента"
+  followers: "Подписчики"
+  favorites: "Избранное"
+  post-form:
+    reply: "Ответить"
+    create-poll: "Создать опрос"
   weekday-short:
     sunday: "Вс"
     monday: "Пн"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 39d9920a4..5b4e6799e 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -270,6 +270,9 @@ common:
     disable-via-mobile: "不要将帖子标记为“来自手机”"
     load-raw-images: "以原始质量显示附加图像"
     load-remote-media: "显示来自远程服务器的媒体"
+    sync: "同步"
+    home-profile: "定制首页数据"
+    deck-profile: "定制Deck数据"
   search: "搜索"
   delete: "删除"
   loading: "正在加载中"
@@ -859,7 +862,7 @@ desktop/views/components/crop-window.vue:
   cancel: "取消"
   ok: "确定"
 desktop/views/components/drive-window.vue:
-  used: "使用中"
+  used: "已使用"
 desktop/views/components/drive.file.vue:
   avatar: "头像"
   banner: "背景"
@@ -1016,7 +1019,7 @@ desktop/views/components/settings.apps.vue:
   no-apps: "没有已连接的应用程序"
 common/views/components/drive-settings.vue:
   max: "容量"
-  in-use: "正在使用"
+  in-use: "已使用"
   stats: "统计"
 common/views/components/mute-and-block.vue:
   mute-and-block: "屏蔽/拉黑"
@@ -1103,7 +1106,10 @@ admin/views/index.vue:
   abuse: "举报垃圾信息"
   queue: "作业队列"
   logs: "登录"
+  db: "数据库"
   back-to-misskey: "返回 Misskey"
+admin/views/db.vue:
+  tables: "表格"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "账户"
@@ -1518,7 +1524,7 @@ desktop/views/widgets/users.vue:
   refresh: "更多"
   no-one: "不是！"
 mobile/views/components/drive.vue:
-  used: "使用中"
+  used: "已使用"
   folder-count: "文件夹"
   count-separator: "，"
   file-count: "文件"
@@ -1941,6 +1947,8 @@ pages:
       _pick:
         arg1: "列表"
         arg2: "位置"
+      _listLen:
+        arg1: "列表"
       number: "数值"
       stringToNumber: "文本到数字"
       _stringToNumber:

From 20f11a6701d6c14cb4cdfcd60f1e825bb45e1d16 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 23 Jun 2019 00:21:58 +0900
Subject: [PATCH 15/15] 11.23.0

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd6e095b..e7800ab72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,21 @@ npm i -g ts-node
 npm run migrate
 ```
 
+11.23.0 (2019/06/23)
+--------------------
+### ✨Improvements
+* ホーム/デッキのカスタマイズ情報を複数のデバイスで同期できるように
+* ホーム/デッキのカスタマイズ情報の複数プリセット切り替え
+* サーバー情報にRedisのバージョンを追加
+* ServiceWorker有効化
+* MisskeyPagesでリストの要素数を取得する関数を追加
+* URLプレビューでハッシュだけ違うプレビューカードは表示しないように
+* URLプレビューをユーザーロケールで出し分けるように
+* リモートの凍結されたアカウントからのアクティビティはすべて無視するように
+
+### 🐛Fixes
+* フォロー解除してもフォローボタンがフォロー中のままになる問題を修正
+
 11.22.0 (2019/06/18)
 --------------------
 ### ✨Improvements
diff --git a/package.json b/package.json
index e5946f04f..9d609db15 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.22.0",
+	"version": "11.23.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",