From 82d2b0608fc8301b18ba4c1b90a7c2a8c767bddf Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 21 Mar 2019 04:10:49 +0900
Subject: [PATCH 1/8] fix #1442, fix #2106

---
 src/client/app/boot.js                        |  2 +-
 src/client/app/desktop/views/home/home.vue    |  6 ++--
 .../app/desktop/views/home/timeline.vue       | 28 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 6cb1488e40..01104bf715 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -84,7 +84,7 @@
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = /mobile|iphone|ipad|android/.test(ua);
+	const isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
 
 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];
diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue
index 3d05bee48d..a4232a90a8 100644
--- a/src/client/app/desktop/views/home/home.vue
+++ b/src/client/app/desktop/views/home/home.vue
@@ -39,7 +39,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="main" :class="{ side: widgets.left.length == 0 || widgets.right.length == 0 }">
+		<div class="main" :class="{ side: !customize && (widgets.left.length == 0 || widgets.right.length == 0) }">
 			<template v-if="customize">
 				<x-draggable v-for="place in ['left', 'right']"
 					:list="widgets[place]"
@@ -62,7 +62,7 @@
 				</div>
 			</template>
 			<template v-else>
-				<div v-for="place in ['left', 'right']" :class="place">
+				<div v-for="place in ['left', 'right']" :class="place" :key="place">
 					<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" platform="desktop"/>
 				</div>
 				<div class="main">
@@ -392,7 +392,7 @@ export default Vue.extend({
 					margin 0 auto
 
 		&:not(.side)
-			@media (max-width 1200px)
+			@media (max-width 1100px)
 				> *:not(.main)
 					display none
 
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
index d8da6e4e26..b870395c18 100644
--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -4,12 +4,12 @@
 	<div class="main">
 		<component :is="src == 'list' ? 'mk-user-list-timeline' : 'x-core'" ref="tl" v-bind="options">
 			<header class="zahtxcqi">
-				<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
-				<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
-				<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
-				<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
-				<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
-				<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</span>
+				<div :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</div>
+				<div :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</div>
+				<div :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</div>
+				<div :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</div>
+				<div :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</div>
+				<div :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</div>
 				<div class="buttons">
 					<button :data-active="src == 'mentions'" @click="src = 'mentions'" :title="$t('mentions')"><fa icon="at"/><i class="indicator" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></button>
 					<button :data-active="src == 'messages'" @click="src = 'messages'" :title="$t('messages')"><fa :icon="['far', 'envelope']"/><i class="indicator" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></button>
@@ -200,18 +200,19 @@ export default Vue.extend({
 		&.shadow
 			box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
 
-	.zahtxcqi
+	header.zahtxcqi
+		display flex
+		flex-wrap wrap
 		padding 0 8px
 		z-index 10
 		background var(--faceHeader)
 		box-shadow 0 var(--lineWidth) var(--desktopTimelineHeaderShadow)
 
+		> *
+			flex-shrink 0
+
 		> .buttons
-			position absolute
-			z-index 2
-			top 0
-			right 0
-			padding-right 8px
+			margin-left auto
 
 			> button
 				padding 0 8px
@@ -244,8 +245,7 @@ export default Vue.extend({
 						height 2px
 						background var(--primary)
 
-		> span
-			display inline-block
+		> div:not(.buttons)
 			padding 0 10px
 			line-height 42px
 			font-size 12px

From c2fc637575d2e086d8024ab404736b78a5ffbf4e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 21 Mar 2019 04:55:23 +0900
Subject: [PATCH 2/8] revert

---
 src/client/app/desktop/views/home/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue
index a4232a90a8..527c2d52ef 100644
--- a/src/client/app/desktop/views/home/home.vue
+++ b/src/client/app/desktop/views/home/home.vue
@@ -39,7 +39,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="main" :class="{ side: !customize && (widgets.left.length == 0 || widgets.right.length == 0) }">
+		<div class="main" :class="{ side: widgets.left.length == 0 || widgets.right.length == 0 }">
 			<template v-if="customize">
 				<x-draggable v-for="place in ['left', 'right']"
 					:list="widgets[place]"

From 2afcdda0587b8f63b5bfd8c28348ede41b5f12ee Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 19 Apr 2019 11:07:54 +0900
Subject: [PATCH 3/8] wip

---
 locales/ja-JP.yml                             | 13 ++++++
 src/client/app/boot.js                        | 16 ++++----
 .../views/components/settings/app-type.vue    | 40 +++++++++++++++++++
 .../views/components/settings/settings.vue    |  3 ++
 src/client/app/store.ts                       |  1 +
 5 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 src/client/app/common/views/components/settings/app-type.vue

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5daf7e7e3a..c5325d2fab 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -460,6 +460,8 @@ common/views/components/connect-failed.troubleshooter.vue:
   flush: "キャッシュの削除"
   set-version: "バージョン指定"
 
+
+
 common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -637,6 +639,17 @@ common/views/components/emoji-picker.vue:
   symbols: "記号"
   flags: "旗"
 
+common/views/components/settings/client-mode.vue:
+  title: "クライアント"
+  select-app-type: "利用するクライアントのモード"
+  choices:
+    auto: "自動で選択"
+    desktop: "デスクトップ版に固定"
+    mobile: "モバイル版に固定"
+  desktop: "デスクトップ"
+  mobile: "モバイル"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 01104bf715..56eb59e21e 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -35,12 +35,12 @@
 	const url = new URL(location.href);
 
 	//#region Detect app name
-	let app = null;
+	var appType = null;
 
-	if (`${url.pathname}/`.startsWith('/docs/')) app = 'docs';
-	if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
-	if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
-	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
+	if (`${url.pathname}/`.startsWith('/docs/')) appType = 'docs';
+	if (`${url.pathname}/`.startsWith('/dev/')) appType = 'dev';
+	if (`${url.pathname}/`.startsWith('/auth/')) appType = 'auth';
+	if (`${url.pathname}/`.startsWith('/admin/')) appType = 'admin';
 	//#endregion
 
 	// Script version
@@ -103,15 +103,15 @@
 	}
 
 	// Switch desktop or mobile version
-	if (app == null) {
-		app = isMobile ? 'mobile' : 'desktop';
+	if (appType == null) {
+		appType = isMobile ? 'mobile' : 'desktop';
 	}
 
 	// Load an app script
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${app}.${ver}.js`);
+	script.setAttribute('src', `/assets/${appType}.${ver}.js`);
 	script.setAttribute('async', 'true');
 	script.setAttribute('defer', 'true');
 	head.appendChild(script);
diff --git a/src/client/app/common/views/components/settings/app-type.vue b/src/client/app/common/views/components/settings/app-type.vue
new file mode 100644
index 0000000000..533fd51517
--- /dev/null
+++ b/src/client/app/common/views/components/settings/app-type.vue
@@ -0,0 +1,40 @@
+<template>
+<ui-card>
+	<template #title><fa :icon="faMobile"/> {{ $t('title') }}</template>
+
+	<section class="fit-top">
+		<ui-select v-model="lang" :placeholder="$t('select-app-type')">
+			<option v-for="x in ['auto', 'desktop', 'mobile']" :value="x" :key="x">{{ $t(`choices.${x}`) }}</option>
+		</ui-select>
+		<ui-info>Current: <i>{{ $t(currentAppType) }}</i></ui-info>
+		<ui-info warn>{{ $t('info') }}</ui-info>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { langs } from '../../../../config';
+import { faMobile } from '@fortawesome/free-solid-svg-icons'
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/settings/client-mode.vue'),
+
+	data() {
+		return {
+			langs,
+			currentAppType: (window as any).appType,
+
+			faMobile
+		};
+	},
+
+	computed: {
+		appTypeForce: {
+			get() { return this.$store.state.device.appTypeForce; },
+			set(value) { this.$store.commit('device/set', { key: 'appTypeForce', value }); }
+		},
+	},
+});
+</script>
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 1254eb5e5e..5f370c8be7 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -163,6 +163,7 @@
 		</ui-card>
 
 		<x-language/>
+		<x-app-type/>
 	</template>
 
 	<template v-if="page == null || page == 'notification'">
@@ -271,6 +272,7 @@ import XPassword from './password.vue';
 import XProfile from './profile.vue';
 import XApi from './api.vue';
 import XLanguage from './language.vue';
+import XAppType from './app-type.vue';
 import XNotification from './notification.vue';
 
 import { url, version } from '../../../../config';
@@ -291,6 +293,7 @@ export default Vue.extend({
 		XProfile,
 		XApi,
 		XLanguage,
+		XAppType,
 		XNotification,
 	},
 	props: {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 852d2c393d..cca7a5c2ce 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -60,6 +60,7 @@ const defaultDeviceSettings = {
 	soundVolume: 0.5,
 	mediaVolume: 0.5,
 	lang: null,
+	appTypeForce: 'auto',
 	debug: false,
 	lightmode: false,
 	loadRawImages: false,

From 899fc8a7bd0938fb36d40f9f3fa5fa3114b9d892 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 19 Apr 2019 13:27:34 +0900
Subject: [PATCH 4/8] :v:

---
 locales/ja-JP.yml                             |  4 ++--
 src/client/app/boot.js                        | 20 ++++++++++---------
 .../views/components/settings/app-type.vue    | 11 +++++-----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c5325d2fab..04d43d91d9 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -640,8 +640,8 @@ common/views/components/emoji-picker.vue:
   flags: "旗"
 
 common/views/components/settings/client-mode.vue:
-  title: "クライアント"
-  select-app-type: "利用するクライアントのモード"
+  title: "モード"
+  intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
   choices:
     auto: "自動で選択"
     desktop: "デスクトップ版に固定"
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 56eb59e21e..87a12e5cfa 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -35,12 +35,12 @@
 	const url = new URL(location.href);
 
 	//#region Detect app name
-	var appType = null;
+	window.appType = null;
 
-	if (`${url.pathname}/`.startsWith('/docs/')) appType = 'docs';
-	if (`${url.pathname}/`.startsWith('/dev/')) appType = 'dev';
-	if (`${url.pathname}/`.startsWith('/auth/')) appType = 'auth';
-	if (`${url.pathname}/`.startsWith('/admin/')) appType = 'admin';
+	if (`${url.pathname}/`.startsWith('/docs/')) window.appType = 'docs';
+	if (`${url.pathname}/`.startsWith('/dev/')) window.appType = 'dev';
+	if (`${url.pathname}/`.startsWith('/auth/')) window.appType = 'auth';
+	if (`${url.pathname}/`.startsWith('/admin/')) window.appType = 'admin';
 	//#endregion
 
 	// Script version
@@ -84,7 +84,9 @@
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
+	const isMobile = settings.device.appTypeForce === 'mobile' ||
+		(settings.device.appTypeForce !== 'desktop'
+			&& (/mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576));
 
 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];
@@ -103,15 +105,15 @@
 	}
 
 	// Switch desktop or mobile version
-	if (appType == null) {
-		appType = isMobile ? 'mobile' : 'desktop';
+	if (window.appType == null) {
+		window.appType = isMobile ? 'mobile' : 'desktop';
 	}
 
 	// Load an app script
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${appType}.${ver}.js`);
+	script.setAttribute('src', `/assets/${window.appType}.${ver}.js`);
 	script.setAttribute('async', 'true');
 	script.setAttribute('defer', 'true');
 	head.appendChild(script);
diff --git a/src/client/app/common/views/components/settings/app-type.vue b/src/client/app/common/views/components/settings/app-type.vue
index 533fd51517..61a23866e2 100644
--- a/src/client/app/common/views/components/settings/app-type.vue
+++ b/src/client/app/common/views/components/settings/app-type.vue
@@ -1,9 +1,10 @@
 <template>
 <ui-card>
-	<template #title><fa :icon="faMobile"/> {{ $t('title') }}</template>
+	<template #title><fa :icon="faMobileAlt"/> {{ $t('title') }}</template>
 
 	<section class="fit-top">
-		<ui-select v-model="lang" :placeholder="$t('select-app-type')">
+		<p>{{ $t('intro') }}</p>
+		<ui-select v-model="appTypeForce" :placeholder="$t('intro')">
 			<option v-for="x in ['auto', 'desktop', 'mobile']" :value="x" :key="x">{{ $t(`choices.${x}`) }}</option>
 		</ui-select>
 		<ui-info>Current: <i>{{ $t(currentAppType) }}</i></ui-info>
@@ -15,18 +16,16 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../../i18n';
-import { langs } from '../../../../config';
-import { faMobile } from '@fortawesome/free-solid-svg-icons'
+import { faMobileAlt } from '@fortawesome/free-solid-svg-icons'
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/settings/client-mode.vue'),
 
 	data() {
 		return {
-			langs,
 			currentAppType: (window as any).appType,
 
-			faMobile
+			faMobileAlt
 		};
 	},
 

From 5afe96e15ab53623b51e41bde09f0439cfe91f0e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 19 Apr 2019 13:31:40 +0900
Subject: [PATCH 5/8] clean up

---
 locales/ja-JP.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 04d43d91d9..4cdb4a7985 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -460,8 +460,6 @@ common/views/components/connect-failed.troubleshooter.vue:
   flush: "キャッシュの削除"
   set-version: "バージョン指定"
 
-
-
 common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"

From 788edd3622ced91806f6dc2a4c5b8b8f17069a59 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 3 May 2019 00:05:12 +0900
Subject: [PATCH 6/8] fix

---
 locales/ja-JP.yml                                |  4 +---
 src/client/app/boot.js                           | 16 ++++++++--------
 .../views/components/settings/app-type.vue       |  5 +----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4cdb4a7985..9df3b0e278 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -637,15 +637,13 @@ common/views/components/emoji-picker.vue:
   symbols: "記号"
   flags: "旗"
 
-common/views/components/settings/client-mode.vue:
+common/views/components/settings/app-type.vue:
   title: "モード"
   intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
   choices:
     auto: "自動で選択"
     desktop: "デスクトップ版に固定"
     mobile: "モバイル版に固定"
-  desktop: "デスクトップ"
-  mobile: "モバイル"
   info: "変更はページの再度読み込み後に反映されます。"
 
 common/views/components/signin.vue:
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 87a12e5cfa..29052c1519 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -35,12 +35,12 @@
 	const url = new URL(location.href);
 
 	//#region Detect app name
-	window.appType = null;
+	let app = null;
 
-	if (`${url.pathname}/`.startsWith('/docs/')) window.appType = 'docs';
-	if (`${url.pathname}/`.startsWith('/dev/')) window.appType = 'dev';
-	if (`${url.pathname}/`.startsWith('/auth/')) window.appType = 'auth';
-	if (`${url.pathname}/`.startsWith('/admin/')) window.appType = 'admin';
+	if (`${url.pathname}/`.startsWith('/docs/')) app = 'docs';
+	if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
+	if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
+	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
 	//#endregion
 
 	// Script version
@@ -105,15 +105,15 @@
 	}
 
 	// Switch desktop or mobile version
-	if (window.appType == null) {
-		window.appType = isMobile ? 'mobile' : 'desktop';
+	if (app == null) {
+		app = isMobile ? 'mobile' : 'desktop';
 	}
 
 	// Load an app script
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${window.appType}.${ver}.js`);
+	script.setAttribute('src', `/assets/${app}.${ver}.js`);
 	script.setAttribute('async', 'true');
 	script.setAttribute('defer', 'true');
 	head.appendChild(script);
diff --git a/src/client/app/common/views/components/settings/app-type.vue b/src/client/app/common/views/components/settings/app-type.vue
index 61a23866e2..90ff28803b 100644
--- a/src/client/app/common/views/components/settings/app-type.vue
+++ b/src/client/app/common/views/components/settings/app-type.vue
@@ -7,7 +7,6 @@
 		<ui-select v-model="appTypeForce" :placeholder="$t('intro')">
 			<option v-for="x in ['auto', 'desktop', 'mobile']" :value="x" :key="x">{{ $t(`choices.${x}`) }}</option>
 		</ui-select>
-		<ui-info>Current: <i>{{ $t(currentAppType) }}</i></ui-info>
 		<ui-info warn>{{ $t('info') }}</ui-info>
 	</section>
 </ui-card>
@@ -19,12 +18,10 @@ import i18n from '../../../../i18n';
 import { faMobileAlt } from '@fortawesome/free-solid-svg-icons'
 
 export default Vue.extend({
-	i18n: i18n('common/views/components/settings/client-mode.vue'),
+	i18n: i18n('common/views/components/settings/app-type.vue'),
 
 	data() {
 		return {
-			currentAppType: (window as any).appType,
-
 			faMobileAlt
 		};
 	},

From 22c4842154f3ef8ee60f89972257d315b0cede4b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 29 May 2019 20:44:20 +0900
Subject: [PATCH 7/8] 
 https://github.com/syuilo/misskey/pull/4549#discussion_r287750004

---
 src/client/app/boot.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 29052c1519..1449334657 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -84,9 +84,14 @@
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = settings.device.appTypeForce === 'mobile' ||
-		(settings.device.appTypeForce !== 'desktop'
-			&& (/mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576));
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576
+	if (settings && settings.device.appTypeForce) {
+		if (settings.device.appTypeForce === 'mobile') {
+			isMobile = true
+		} else if (settings.device.appTypeForce === 'desktop') {
+			isMobile = false
+		}
+	}
 
 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];

From 6064c3ae47df8b1cc07874731ec7dddf7c30bbe8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 8 Jul 2019 04:32:57 +0900
Subject: [PATCH 8/8] Add semicolons

---
 src/client/app/boot.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 1449334657..583cc4fc8b 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -84,12 +84,12 @@
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
 	if (settings && settings.device.appTypeForce) {
 		if (settings.device.appTypeForce === 'mobile') {
-			isMobile = true
+			isMobile = true;
 		} else if (settings.device.appTypeForce === 'desktop') {
-			isMobile = false
+			isMobile = false;
 		}
 	}
 
