From 4dfb5f1062fe7a86207db6a9c13074a875e03c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 5 Dec 2018 11:42:52 +0100
Subject: [PATCH 1/2] Suggest to follow Nextcloud on mastodon on first use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/views/Timeline.vue | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index 4a6e986f..f91f8a58 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -8,6 +8,11 @@
 					{{ t('social', 'We automatically created a social account for you. Your social ID is the same as your federated cloud ID:') }}
 					<span class="social-id">{{ socialId }}</span>
 				</p>
+				<div ng-show="followingNextcloud" class="follow-nextcloud">
+					<p>{{ t('social', 'Since you are new to social, you might be interested to follow the Nextcloud account, so you don\'t miss any news') }}</p>
+					<input :value="t('social', 'Follow Nextcloud on mastodon.xyz')" type="button" class="primary"
+						@click="followNextcloud">
+				</div>
 			</div>
 		</transition>
 		<composer />
@@ -44,6 +49,15 @@
 		font-weight: bold;
 	}
 
+	.social__welcome .follow-nextcloud {
+		overflow: hidden;
+		margin-top: 20px;
+	}
+
+	.social__welcome .follow-nextcloud input[type=button] {
+		float: right;
+	}
+
 	.social__timeline {
 		max-width: 600px;
 		margin: 15px auto;
@@ -78,6 +92,7 @@ import InfiniteLoading from 'vue-infinite-loading'
 import TimelineEntry from './../components/TimelineEntry'
 import Composer from './../components/Composer'
 import CurrentUserMixin from './../mixins/currentUserMixin'
+import follow from './../mixins/follow'
 import EmptyContent from './../components/EmptyContent'
 import TimelineList from './../components/TimelineList'
 
@@ -93,10 +108,17 @@ export default {
 		EmptyContent,
 		TimelineList
 	},
-	mixins: [CurrentUserMixin],
+	mixins: [
+		CurrentUserMixin,
+		follow
+	],
 	data: function() {
 		return {
-			infoHidden: false
+			infoHidden: false,
+			followingNextcloud: false,
+			item: {
+				account: 'nextcloud@mastodon.xyz'
+			}
 		}
 	},
 	computed: {
@@ -116,6 +138,11 @@ export default {
 	methods: {
 		hideInfo() {
 			this.infoHidden = true
+		},
+		followNextcloud() {
+			this.follow().then(() => {
+				this.followingNextcloud = true
+			})
 		}
 	}
 }

From b08cb01e771a29677460735fdc3588ab55d8b257 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 5 Dec 2018 12:33:41 +0100
Subject: [PATCH 2/2] Minor wording enhancements for first run

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 src/views/Timeline.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index f91f8a58..527fdb23 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -5,11 +5,11 @@
 				<a class="close icon-close" href="#" @click="hideInfo()"><span class="hidden-visually">Close</span></a>
 				<h2>🎉 {{ t('social', 'Nextcloud becomes part of the federated social networks!') }}</h2>
 				<p>
-					{{ t('social', 'We automatically created a social account for you. Your social ID is the same as your federated cloud ID:') }}
+					{{ t('social', 'We automatically created a Social account for you. Your Social ID is the same as your federated cloud ID:') }}
 					<span class="social-id">{{ socialId }}</span>
 				</p>
 				<div ng-show="followingNextcloud" class="follow-nextcloud">
-					<p>{{ t('social', 'Since you are new to social, you might be interested to follow the Nextcloud account, so you don\'t miss any news') }}</p>
+					<p>{{ t('social', 'Since you are new to Social, start by following the official Nextcloud account so you don\'t miss any news') }}</p>
 					<input :value="t('social', 'Follow Nextcloud on mastodon.xyz')" type="button" class="primary"
 						@click="followNextcloud">
 				</div>