From 10232c5866bdb79dd2d6cbc91d2b8f3827af3ad4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 7 Sep 2018 00:52:13 +0900
Subject: [PATCH] Fix bug & some refactor

---
 .../app/common/views/widgets/broadcast.vue       | 16 ++++++++--------
 src/client/app/desktop/views/pages/welcome.vue   |  2 +-
 .../app/mobile/views/components/ui.nav.vue       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue
index e4e77263e..c0f97e97c 100644
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="anltbovirfeutcigvwgmgxipejaeozxi"
-	:data-found="broadcasts.length != 0"
+	:data-found="announcements && announcements.length != 0"
 	:data-melt="props.design == 1"
 	:data-mobile="platform == 'mobile'"
 >
@@ -14,12 +14,12 @@
 		</svg>
 	</div>
 	<p class="fetching" v-if="fetching">%i18n:@fetching%<mk-ellipsis/></p>
-	<h1 v-if="!fetching">{{ broadcasts.length == 0 ? '%i18n:@no-broadcasts%' : broadcasts[i].title }}</h1>
+	<h1 v-if="!fetching">{{ announcements.length == 0 ? '%i18n:@no-broadcasts%' : announcements[i].title }}</h1>
 	<p v-if="!fetching">
-		<span v-if="broadcasts.length != 0" v-html="broadcasts[i].text"></span>
-		<template v-if="broadcasts.length == 0">%i18n:@have-a-nice-day%</template>
+		<span v-if="announcements.length != 0" v-html="announcements[i].text"></span>
+		<template v-if="announcements.length == 0">%i18n:@have-a-nice-day%</template>
 	</p>
-	<a v-if="broadcasts.length > 1" @click="next">%i18n:@next% &gt;&gt;</a>
+	<a v-if="announcements.length > 1" @click="next">%i18n:@next% &gt;&gt;</a>
 </div>
 </template>
 
@@ -36,18 +36,18 @@ export default define({
 		return {
 			i: 0,
 			fetching: true,
-			broadcasts: []
+			announcements: []
 		};
 	},
 	mounted() {
 		(this as any).os.getMeta().then(meta => {
-			this.broadcasts = meta.broadcasts;
+			this.announcements = meta.broadcasts;
 			this.fetching = false;
 		});
 	},
 	methods: {
 		next() {
-			if (this.i == this.broadcasts.length - 1) {
+			if (this.i == this.announcements.length - 1) {
 				this.i = 0;
 			} else {
 				this.i++;
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 0138fde27..d55029fb5 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -33,7 +33,7 @@
 
 		<div class="announcements block">
 			<header>%fa:broadcast-tower% %i18n:@announcements%</header>
-			<div>
+			<div v-if="announcements && announcements.length > 0">
 				<div v-for="announcement in announcements">
 					<h1 v-html="announcement.title"></h1>
 					<div v-html="announcement.text"></div>
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue
index 83a8eb439..c3ae05fef 100644
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@@ -34,7 +34,7 @@
 					<li @click="dark"><p><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template><span>%i18n:@darkmode%</span></p></li>
 				</ul>
 			</div>
-			<div class="announcements" v-if="announcements.length > 0">
+			<div class="announcements" v-if="announcements && announcements.length > 0">
 				<article v-for="announcement in announcements">
 					<span v-html="announcement.title" class="title"></span>
 					<div v-html="announcement.text"></div>