From bc634c42a8713a7ba7e76e76dd924ef1f7d94bbe Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Tue, 28 May 2019 13:03:14 +0200
Subject: [PATCH 01/11] =?UTF-8?q?=F0=9F=93=A6=20NEW:=20display=20boosted?=
 =?UTF-8?q?=20posts=20with=20an=20according=20indication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineContent.vue | 215 +++++++++++++++++++++++++++++
 src/components/TimelineEntry.vue   | 208 +++++-----------------------
 2 files changed, 246 insertions(+), 177 deletions(-)
 create mode 100644 src/components/TimelineContent.vue

diff --git a/src/components/TimelineContent.vue b/src/components/TimelineContent.vue
new file mode 100644
index 00000000..e2423425
--- /dev/null
+++ b/src/components/TimelineContent.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="entry-content">
+    <div v-if="item.actor_info" class="post-avatar">
+      <avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername"
+        :display-name="item.actor_info.account" :disable-tooltip="true" />
+      <avatar v-else :size="32" :url="avatarUrl"
+        :disable-tooltip="true" />
+    </div>
+    <div class="post-content">
+      <div class="post-author-wrapper">
+        <router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
+          <span class="post-author">
+            {{ userDisplayName(item.actor_info) }}
+          </span>
+          <span class="post-author-id">
+            @{{ item.actor_info.account }}
+          </span>
+        </router-link>
+        <a v-else :href="item.attributedTo">
+          <span class="post-author-id">
+            {{ item.attributedTo }}
+          </span>
+        </a>
+      </div>
+      <!-- eslint-disable-next-line vue/no-v-html -->
+      <div class="post-message" v-html="formatedMessage" />
+      <div v-click-outside="hidePopoverMenu" class="post-actions">
+        <a v-tooltip.bottom="t('social', 'Reply')" class="icon-reply" @click.prevent="reply" />
+        <a v-if="item.actor_info.account !== cloudId" v-tooltip.bottom="t('social', 'Boost')"
+          :class="(isBoosted) ? 'icon-boosted' : 'icon-boost'"
+          @click.prevent="boost" />
+        <div v-if="popoverMenu.length > 0" v-tooltip.bottom="t('social', 'More actions')" class="post-actions-more">
+          <a class="icon-more" @click.prevent="togglePopoverMenu" />
+          <div :class="{open: menuOpened}" class="popovermenu menu-center">
+            <popover-menu :menu="popoverMenu" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
+        {{ relativeTimestamp }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
+import * as linkify from 'linkifyjs'
+import pluginTag from 'linkifyjs/plugins/hashtag'
+import pluginMention from 'linkifyjs/plugins/mention'
+import 'linkifyjs/string'
+import popoverMenu from './../mixins/popoverMenu'
+import currentUser from './../mixins/currentUserMixin'
+
+pluginTag(linkify)
+pluginMention(linkify)
+
+export default {
+	name: 'TimelineContent',
+	components: {
+		Avatar
+	},
+	mixins: [popoverMenu, currentUser],
+	props: {
+		item: { type: Object, default: () => {} }
+	},
+	data() {
+		return {
+		}
+	},
+	computed: {
+		popoverMenu() {
+			var actions = [
+			]
+			if (this.item.actor_info.account === this.cloudId) {
+				actions.push(
+					{
+						action: () => {
+							this.$store.dispatch('postDelete', this.item)
+							this.hidePopoverMenu()
+						},
+						icon: 'icon-delete',
+						text: t('social', 'Delete post')
+					}
+				)
+			}
+			return actions
+		},
+		relativeTimestamp() {
+			return OC.Util.relativeModifiedDate(this.item.published)
+		},
+		timestamp() {
+			return Date.parse(this.item.published)
+		},
+		formatedMessage() {
+			let message = this.item.content
+			if (typeof message === 'undefined') {
+				return ''
+			}
+			message = message.replace(/(?:\r\n|\r|\n)/g, '<br />')
+			message = message.linkify({
+				formatHref: {
+					hashtag: function(href) {
+						return OC.generateUrl('/apps/social/timeline/tags/' + href.substring(1))
+					},
+					mention: function(href) {
+						return OC.generateUrl('/apps/social/@' + href.substring(1))
+					}
+				}
+			})
+			message = this.$twemoji.parse(message)
+			return message
+		},
+		avatarUrl() {
+			return OC.generateUrl('/apps/social/api/v1/global/actor/avatar?id=' + this.item.attributedTo)
+		},
+		isBoosted() {
+			if (typeof this.item.action === 'undefined') {
+				return false
+			}
+			return !!this.item.action.values.boosted
+		}
+	},
+	methods: {
+		userDisplayName(actorInfo) {
+			return actorInfo.name !== '' ? actorInfo.name : actorInfo.preferredUsername
+		},
+		reply() {
+			this.$root.$emit('composer-reply', this.item)
+		},
+		boost() {
+			if (this.isBoosted) {
+				this.$store.dispatch('postUnBoost', this.item)
+			} else {
+				this.$store.dispatch('postBoost', this.item)
+			}
+		}
+	}
+}
+</script>
+<style scoped lang="scss">
+	.post-author {
+		font-weight: bold;
+	}
+
+	.post-author-id {
+		opacity: .7;
+	}
+
+	.post-avatar {
+		margin: 5px;
+		margin-right: 10px;
+		border-radius: 50%;
+		overflow: hidden;
+		width: 32px;
+		height: 32px;
+		min-width: 32px;
+		flex-shrink: 0;
+	}
+
+	.post-timestamp {
+		width: 120px;
+		text-align: right;
+		flex-shrink: 0;
+	}
+
+	.post-actions {
+		margin-left: -13px;
+		height: 44px;
+
+		.post-actions-more {
+			position: relative;
+			width: 44px;
+			height: 34px;
+			display: inline-block;
+		}
+		.icon-reply,
+		.icon-boost,
+		.icon-boosted,
+		.icon-more {
+			display: inline-block;
+			width: 44px;
+			height: 34px;
+			opacity: .5;
+			&:hover, &:focus {
+				opacity: 1;
+			}
+		}
+		.icon-boosted {
+			opacity: 1;
+		}
+	}
+
+	span {
+		/* opacity: 0.5; */
+	}
+	.entry-content {
+		display: flex;
+	}
+
+	.post-content {
+		flex-grow: 1;
+	}
+
+	.post-timestamp {
+		opacity: .7;
+	}
+</style>
+<style>
+	.post-message a {
+		text-decoration: underline;
+	}
+</style>
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index d9d64e92..fa3d555b 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,70 +1,31 @@
 <template>
 	<div class="timeline-entry">
-		<div class="entry-content">
-			<div v-if="item.actor_info" class="post-avatar">
-				<avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername"
-					:display-name="item.actor_info.account" :disable-tooltip="true" />
-				<avatar v-else :size="32" :url="avatarUrl"
-					:disable-tooltip="true" />
-			</div>
-			<div class="post-content">
-				<div class="post-author-wrapper">
-					<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
-						<span class="post-author">
-							{{ userDisplayName(item.actor_info) }}
-						</span>
-						<span class="post-author-id">
-							@{{ item.actor_info.account }}
-						</span>
-					</router-link>
-					<a v-else :href="item.attributedTo">
-						<span class="post-author-id">
-							{{ item.attributedTo }}
-						</span>
-					</a>
-				</div>
-				<!-- eslint-disable-next-line vue/no-v-html -->
-				<div class="post-message" v-html="formatedMessage" />
-				<div v-click-outside="hidePopoverMenu" class="post-actions">
-					<a v-tooltip.bottom="t('social', 'Reply')" class="icon-reply" @click.prevent="reply" />
-					<a v-if="item.actor_info.account !== cloudId" v-tooltip.bottom="t('social', 'Boost')"
-						:class="(isBoosted) ? 'icon-boosted' : 'icon-boost'"
-						@click.prevent="boost" />
-					<div v-if="popoverMenu.length > 0" v-tooltip.bottom="t('social', 'More actions')" class="post-actions-more">
-						<a class="icon-more" @click.prevent="togglePopoverMenu" />
-						<div :class="{open: menuOpened}" class="popovermenu menu-center">
-							<popover-menu :menu="popoverMenu" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div>
-				<div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
-					{{ relativeTimestamp }}
-				</div>
-			</div>
+		<div v-if="item.type === 'Announce'" class="boost">
+			<span class="icon-container"><span class="icon-boost"></span></span>
+			<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
+				<span v-tooltip.bottom="item.actor_info.account" class="post-author">
+					{{ userDisplayName(item.actor_info) }}
+				</span>
+			</router-link>
+			<a v-else :href="item.attributedTo">
+				<span class="post-author-id">
+					{{ item.attributedTo }}
+				</span>
+			</a>
+			{{ boosted }}
 		</div>
+		<timeline-content :item="entryContent" />
 	</div>
 </template>
 
 <script>
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
-import * as linkify from 'linkifyjs'
-import pluginTag from 'linkifyjs/plugins/hashtag'
-import pluginMention from 'linkifyjs/plugins/mention'
-import 'linkifyjs/string'
-import popoverMenu from './../mixins/popoverMenu'
-import currentUser from './../mixins/currentUserMixin'
-
-pluginTag(linkify)
-pluginMention(linkify)
+import TimelineContent from './TimelineContent.vue'
 
 export default {
 	name: 'TimelineEntry',
 	components: {
-		Avatar
+		TimelineContent
 	},
-	mixins: [popoverMenu, currentUser],
 	props: {
 		item: { type: Object, default: () => {} }
 	},
@@ -73,71 +34,21 @@ export default {
 		}
 	},
 	computed: {
-		popoverMenu() {
-			var actions = [
-			]
-			if (this.item.actor_info.account === this.cloudId) {
-				actions.push(
-					{
-						action: () => {
-							this.$store.dispatch('postDelete', this.item)
-							this.hidePopoverMenu()
-						},
-						icon: 'icon-delete',
-						text: t('social', 'Delete post')
-					}
-				)
+		entryContent() {
+			if (this.item.type === 'Announce') {
+				return this.item.cache[this.item.object].object
+			} else {
+				return this.item
 			}
-			return actions
+
 		},
-		relativeTimestamp() {
-			return OC.Util.relativeModifiedDate(this.item.published)
-		},
-		timestamp() {
-			return Date.parse(this.item.published)
-		},
-		formatedMessage() {
-			let message = this.item.content
-			if (typeof message === 'undefined') {
-				return ''
-			}
-			message = message.replace(/(?:\r\n|\r|\n)/g, '<br />')
-			message = message.linkify({
-				formatHref: {
-					hashtag: function(href) {
-						return OC.generateUrl('/apps/social/timeline/tags/' + href.substring(1))
-					},
-					mention: function(href) {
-						return OC.generateUrl('/apps/social/@' + href.substring(1))
-					}
-				}
-			})
-			message = this.$twemoji.parse(message)
-			return message
-		},
-		avatarUrl() {
-			return OC.generateUrl('/apps/social/api/v1/global/actor/avatar?id=' + this.item.attributedTo)
-		},
-		isBoosted() {
-			if (typeof this.item.action === 'undefined') {
-				return false
-			}
-			return !!this.item.action.values.boosted
+		boosted() {
+			return t('social', 'boosted')
 		}
 	},
 	methods: {
 		userDisplayName(actorInfo) {
 			return actorInfo.name !== '' ? actorInfo.name : actorInfo.preferredUsername
-		},
-		reply() {
-			this.$root.$emit('composer-reply', this.item)
-		},
-		boost() {
-			if (this.isBoosted) {
-				this.$store.dispatch('postUnBoost', this.item)
-			} else {
-				this.$store.dispatch('postBoost', this.item)
-			}
 		}
 	}
 }
@@ -148,6 +59,13 @@ export default {
 		margin-bottom: 10px;
 	}
 
+	.icon-boost {
+		display: inline-block;
+		width: 44px;
+		height: 17px;
+		opacity: .5;
+	}
+
 	.post-author {
 		font-weight: bold;
 	}
@@ -155,68 +73,4 @@ export default {
 	.post-author-id {
 		opacity: .7;
 	}
-
-	.post-avatar {
-		margin: 5px;
-		margin-right: 10px;
-		border-radius: 50%;
-		overflow: hidden;
-		width: 32px;
-		height: 32px;
-		min-width: 32px;
-		flex-shrink: 0;
-	}
-
-	.post-timestamp {
-		width: 120px;
-		text-align: right;
-		flex-shrink: 0;
-	}
-
-	.post-actions {
-		margin-left: -13px;
-		height: 44px;
-
-		.post-actions-more {
-			position: relative;
-			width: 44px;
-			height: 34px;
-			display: inline-block;
-		}
-		.icon-reply,
-		.icon-boost,
-		.icon-boosted,
-		.icon-more {
-			display: inline-block;
-			width: 44px;
-			height: 34px;
-			opacity: .5;
-			&:hover, &:focus {
-				opacity: 1;
-			}
-		}
-		.icon-boosted {
-			opacity: 1;
-		}
-	}
-
-	span {
-		/* opacity: 0.5; */
-	}
-	.entry-content {
-		display: flex;
-	}
-
-	.post-content {
-		flex-grow: 1;
-	}
-
-	.post-timestamp {
-		opacity: .7;
-	}
-</style>
-<style>
-	.post-message a {
-		text-decoration: underline;
-	}
 </style>

From f117996654d3bf3a21cb3bad0997fbdf87b6143d Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Tue, 28 May 2019 16:08:09 +0200
Subject: [PATCH 02/11] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20also=20toggle=20boo?=
 =?UTF-8?q?sted=20state=20on=20the=20chached=20object=20inside=20of=20the?=
 =?UTF-8?q?=20Announce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineContent.vue | 11 ++++++++---
 src/components/TimelineEntry.vue   |  8 ++++++--
 src/store/timeline.js              | 18 ++++++++++++------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/TimelineContent.vue b/src/components/TimelineContent.vue
index e2423425..7e86b0cc 100644
--- a/src/components/TimelineContent.vue
+++ b/src/components/TimelineContent.vue
@@ -64,7 +64,8 @@ export default {
 	},
 	mixins: [popoverMenu, currentUser],
 	props: {
-		item: { type: Object, default: () => {} }
+		item: { type: Object, default: () => {} },
+    parentAnnounce: { type: Object, default: () => {} }
 	},
 	data() {
 		return {
@@ -131,10 +132,14 @@ export default {
 			this.$root.$emit('composer-reply', this.item)
 		},
 		boost() {
+      let params = {
+        post: this.item,
+        parentAnnounce: this.parentAnnounce
+      }
 			if (this.isBoosted) {
-				this.$store.dispatch('postUnBoost', this.item)
+				this.$store.dispatch('postUnBoost', params)
 			} else {
-				this.$store.dispatch('postBoost', this.item)
+				this.$store.dispatch('postBoost', params)
 			}
 		}
 	}
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index fa3d555b..03d25ad3 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -14,7 +14,7 @@
 			</a>
 			{{ boosted }}
 		</div>
-		<timeline-content :item="entryContent" />
+		<timeline-content :item="entryContent" :parentAnnounce="isBoost" />
 	</div>
 </template>
 
@@ -40,7 +40,11 @@ export default {
 			} else {
 				return this.item
 			}
-
+		},
+		isBoost() {
+			if (this.item.type === 'Announce'){
+				return this.item
+			}
 		},
 		boosted() {
 			return t('social', 'boosted')
diff --git a/src/store/timeline.js b/src/store/timeline.js
index f2d72d76..0e39d883 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -54,11 +54,17 @@ const mutations = {
 	setAccount(state, account) {
 		state.account = account
 	},
-	boostPost(state, post) {
+	boostPost(state, { post, parentAnnounce }) {
 		Vue.set(state.timeline[post.id].action.values, 'boosted', true)
+		if (parentAnnounce) {
+			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', true)
+		}
 	},
-	unboostPost(state, post) {
+	unboostPost(state, { post, parentAnnounce }) {
 		Vue.set(state.timeline[post.id].action.values, 'boosted', false)
+		if (parentAnnounce) {
+			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', false)
+		}
 	}
 }
 const getters = {
@@ -103,10 +109,10 @@ const actions = {
 			console.error('Failed to delete the post', error)
 		})
 	},
-	postBoost(context, post) {
+	postBoost(context, { post, parentAnnounce }) {
 		return new Promise((resolve, reject) => {
 			axios.post(OC.generateUrl(`apps/social/api/v1/post/boost?postId=${post.id}`)).then((response) => {
-				context.commit('boostPost', post)
+				context.commit('boostPost', { post, parentAnnounce })
 				// eslint-disable-next-line no-console
 				console.log('Post boosted with token ' + response.data.result.token)
 				resolve(response)
@@ -117,9 +123,9 @@ const actions = {
 			})
 		})
 	},
-	postUnBoost(context, post) {
+	postUnBoost(context, { post, parentAnnounce }) {
 		return axios.delete(OC.generateUrl(`apps/social/api/v1/post/boost?postId=${post.id}`)).then((response) => {
-			context.commit('unboostPost', post)
+			context.commit('unboostPost', { post, parentAnnounce })
 			// eslint-disable-next-line no-console
 			console.log('Boost deleted with token ' + response.data.result.token)
 		}).catch((error) => {

From 37f4d17815a168682616e4c96515a801314bbd35 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 29 May 2019 13:13:45 -0100
Subject: [PATCH 03/11] default values in action

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
cached version of the post contains action.values

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
fixing default values

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Db/CoreRequestBuilder.php | 15 ++++++++++-----
 lib/Model/StreamAction.php    | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 5c1c9f59..640e6316 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -731,8 +731,12 @@ class CoreRequestBuilder {
 		   ->selectAlias('sa.stream_id', 'streamaction_stream_id')
 		   ->selectAlias('sa.values', 'streamaction_values');
 
+		$orX = $expr->orX();
+		$orX->add($expr->eq($func->lower($pf . '.id'), $func->lower('sa.stream_id')));
+		$orX->add($expr->eq($func->lower($pf . '.object_id'), $func->lower('sa.stream_id')));
+
 		$andX = $expr->andX();
-		$andX->add($expr->eq($func->lower($pf . '.id'), $func->lower('sa.stream_id')));
+		$andX->add($orX);
 		$andX->add(
 			$expr->eq(
 				$func->lower('sa.actor_id'),
@@ -763,10 +767,11 @@ class CoreRequestBuilder {
 
 		$action = new StreamAction();
 		$action->importFromDatabase($new);
-
-		if ($action->getId() === 0) {
-			throw new InvalidResourceException();
-		}
+		$action->setDefaultValues(
+			[
+				'boosted' => false
+			]
+		);
 
 		return $action;
 	}
diff --git a/lib/Model/StreamAction.php b/lib/Model/StreamAction.php
index eb6c3098..4235960d 100644
--- a/lib/Model/StreamAction.php
+++ b/lib/Model/StreamAction.php
@@ -209,6 +209,23 @@ class StreamAction implements JsonSerializable {
 	}
 
 
+	/**
+	 * @param array $default
+	 *
+	 * @return StreamAction
+	 */
+	public function setDefaultValues(array $default): StreamAction {
+		$keys = array_keys($default);
+		foreach ($keys as $k) {
+			if (!array_key_exists($k, $this->values)) {
+				$this->values[$k] = $default[$k];
+			}
+		}
+
+		return $this;
+	}
+
+
 	/**
 	 * @param array $data
 	 */

From 99b7b37e570190f75669c41a5fe03e933ab31b8b Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Wed, 29 May 2019 16:54:00 +0200
Subject: [PATCH 04/11] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20lint=20&&=20design?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineContent.vue | 98 +++++++++++++++---------------
 src/components/TimelineEntry.vue   | 17 +++---
 2 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/src/components/TimelineContent.vue b/src/components/TimelineContent.vue
index 7e86b0cc..a1796f0c 100644
--- a/src/components/TimelineContent.vue
+++ b/src/components/TimelineContent.vue
@@ -1,48 +1,48 @@
 <template>
-  <div class="entry-content">
-    <div v-if="item.actor_info" class="post-avatar">
-      <avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername"
-        :display-name="item.actor_info.account" :disable-tooltip="true" />
-      <avatar v-else :size="32" :url="avatarUrl"
-        :disable-tooltip="true" />
-    </div>
-    <div class="post-content">
-      <div class="post-author-wrapper">
-        <router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
-          <span class="post-author">
-            {{ userDisplayName(item.actor_info) }}
-          </span>
-          <span class="post-author-id">
-            @{{ item.actor_info.account }}
-          </span>
-        </router-link>
-        <a v-else :href="item.attributedTo">
-          <span class="post-author-id">
-            {{ item.attributedTo }}
-          </span>
-        </a>
-      </div>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <div class="post-message" v-html="formatedMessage" />
-      <div v-click-outside="hidePopoverMenu" class="post-actions">
-        <a v-tooltip.bottom="t('social', 'Reply')" class="icon-reply" @click.prevent="reply" />
-        <a v-if="item.actor_info.account !== cloudId" v-tooltip.bottom="t('social', 'Boost')"
-          :class="(isBoosted) ? 'icon-boosted' : 'icon-boost'"
-          @click.prevent="boost" />
-        <div v-if="popoverMenu.length > 0" v-tooltip.bottom="t('social', 'More actions')" class="post-actions-more">
-          <a class="icon-more" @click.prevent="togglePopoverMenu" />
-          <div :class="{open: menuOpened}" class="popovermenu menu-center">
-            <popover-menu :menu="popoverMenu" />
-          </div>
-        </div>
-      </div>
-    </div>
-    <div>
-      <div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
-        {{ relativeTimestamp }}
-      </div>
-    </div>
-  </div>
+	<div class="entry-content">
+		<div v-if="item.actor_info" class="post-avatar">
+			<avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername"
+				:display-name="item.actor_info.account" :disable-tooltip="true" />
+			<avatar v-else :size="32" :url="avatarUrl"
+				:disable-tooltip="true" />
+		</div>
+		<div class="post-content">
+			<div class="post-author-wrapper">
+				<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
+					<span class="post-author">
+						{{ userDisplayName(item.actor_info) }}
+					</span>
+					<span class="post-author-id">
+						@{{ item.actor_info.account }}
+					</span>
+				</router-link>
+				<a v-else :href="item.attributedTo">
+					<span class="post-author-id">
+						{{ item.attributedTo }}
+					</span>
+				</a>
+			</div>
+			<!-- eslint-disable-next-line vue/no-v-html -->
+			<div class="post-message" v-html="formatedMessage" />
+			<div v-click-outside="hidePopoverMenu" class="post-actions">
+				<a v-tooltip.bottom="t('social', 'Reply')" class="icon-reply" @click.prevent="reply" />
+				<a v-if="item.actor_info.account !== cloudId" v-tooltip.bottom="t('social', 'Boost')"
+					:class="(isBoosted) ? 'icon-boosted' : 'icon-boost'"
+					@click.prevent="boost" />
+				<div v-if="popoverMenu.length > 0" v-tooltip.bottom="t('social', 'More actions')" class="post-actions-more">
+					<a class="icon-more" @click.prevent="togglePopoverMenu" />
+					<div :class="{open: menuOpened}" class="popovermenu menu-center">
+						<popover-menu :menu="popoverMenu" />
+					</div>
+				</div>
+			</div>
+		</div>
+		<div>
+			<div :data-timestamp="timestamp" class="post-timestamp live-relative-timestamp">
+				{{ relativeTimestamp }}
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
@@ -65,7 +65,7 @@ export default {
 	mixins: [popoverMenu, currentUser],
 	props: {
 		item: { type: Object, default: () => {} },
-    parentAnnounce: { type: Object, default: () => {} }
+		parentAnnounce: { type: Object, default: () => {} }
 	},
 	data() {
 		return {
@@ -132,10 +132,10 @@ export default {
 			this.$root.$emit('composer-reply', this.item)
 		},
 		boost() {
-      let params = {
-        post: this.item,
-        parentAnnounce: this.parentAnnounce
-      }
+			let params = {
+				post: this.item,
+				parentAnnounce: this.parentAnnounce
+			}
 			if (this.isBoosted) {
 				this.$store.dispatch('postUnBoost', params)
 			} else {
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 03d25ad3..b5862b30 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="timeline-entry">
 		<div v-if="item.type === 'Announce'" class="boost">
-			<span class="icon-container"><span class="icon-boost"></span></span>
+			<span class="icon-boost"></span>
 			<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
 				<span v-tooltip.bottom="item.actor_info.account" class="post-author">
 					{{ userDisplayName(item.actor_info) }}
@@ -14,7 +14,7 @@
 			</a>
 			{{ boosted }}
 		</div>
-		<timeline-content :item="entryContent" :parentAnnounce="isBoost" />
+		<timeline-content :item="entryContent" :parent-announce="isBoost" />
 	</div>
 </template>
 
@@ -42,9 +42,10 @@ export default {
 			}
 		},
 		isBoost() {
-			if (this.item.type === 'Announce'){
+			if (this.item.type === 'Announce') {
 				return this.item
 			}
+			return {}
 		},
 		boosted() {
 			return t('social', 'boosted')
@@ -68,13 +69,11 @@ export default {
 		width: 44px;
 		height: 17px;
 		opacity: .5;
+		background-position: right center;
+		vertical-align: middle;
 	}
 
-	.post-author {
-		font-weight: bold;
-	}
-
-	.post-author-id {
-		opacity: .7;
+	.boost {
+		opacity: .5;
 	}
 </style>

From 2714c14e09bc5464cb5593ebcf0cd8d7774c042d Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Wed, 29 May 2019 19:51:16 +0200
Subject: [PATCH 05/11] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20don't=20error=20whe?=
 =?UTF-8?q?n=20boosting=20on=20an=20Announce=20whereof=20the=20original=20?=
 =?UTF-8?q?Note=20isn't=20in=20the=20stream=20as=20well?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/store/timeline.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/store/timeline.js b/src/store/timeline.js
index 0e39d883..5144a6bd 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -55,13 +55,17 @@ const mutations = {
 		state.account = account
 	},
 	boostPost(state, { post, parentAnnounce }) {
-		Vue.set(state.timeline[post.id].action.values, 'boosted', true)
+		if (!typeof state.timeline[post.id] === 'undefined') {
+			Vue.set(state.timeline[post.id].action.values, 'boosted', true)
+		}
 		if (parentAnnounce) {
 			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', true)
 		}
 	},
 	unboostPost(state, { post, parentAnnounce }) {
-		Vue.set(state.timeline[post.id].action.values, 'boosted', false)
+		if (!typeof state.timeline[post.id] === 'undefined') {
+			Vue.set(state.timeline[post.id].action.values, 'boosted', false)
+		}
 		if (parentAnnounce) {
 			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', false)
 		}

From dad67f6de04e1af8506a26beba95c1a58c2be547 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 29 May 2019 19:56:42 -0100
Subject: [PATCH 06/11] Action on Cached Items

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 composer.lock                      |  8 ++++----
 lib/Db/CoreRequestBuilder.php      |  1 -
 lib/Db/StreamRequest.php           |  2 +-
 lib/Db/StreamRequestBuilder.php    | 12 ++++++++++++
 lib/Model/ActivityPub/Stream.php   |  6 +++---
 lib/Service/StreamQueueService.php |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3d0a238f..94cfaf21 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/daita/my-small-php-tools.git",
-                "reference": "732d54bca742e3ecdb2b544589550a37172c1258"
+                "reference": "6e8f346a2ee488655316d1e4139c27417d6b7e4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/732d54bca742e3ecdb2b544589550a37172c1258",
-                "reference": "732d54bca742e3ecdb2b544589550a37172c1258",
+                "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/6e8f346a2ee488655316d1e4139c27417d6b7e4d",
+                "reference": "6e8f346a2ee488655316d1e4139c27417d6b7e4d",
                 "shasum": ""
             },
             "require": {
@@ -40,7 +40,7 @@
                 }
             ],
             "description": "My small PHP Tools",
-            "time": "2019-05-27T17:53:41+00:00"
+            "time": "2019-05-29T20:52:05+00:00"
         },
         {
             "name": "friendica/json-ld",
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 640e6316..a8cb3009 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -755,7 +755,6 @@ class CoreRequestBuilder {
 	 * @param array $data
 	 *
 	 * @return StreamAction
-	 * @throws InvalidResourceException
 	 */
 	protected function parseStreamActionsLeftJoin(array $data): StreamAction {
 		$new = [];
diff --git a/lib/Db/StreamRequest.php b/lib/Db/StreamRequest.php
index 1555c19a..2fd8cb21 100644
--- a/lib/Db/StreamRequest.php
+++ b/lib/Db/StreamRequest.php
@@ -524,7 +524,7 @@ class StreamRequest extends StreamRequestBuilder {
 		}
 
 		$cache = '[]';
-		if ($stream->gotCache()) {
+		if ($stream->hasCache()) {
 			$cache = json_encode($stream->getCache(), JSON_UNESCAPED_SLASHES);
 		}
 
diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php
index f4cbbe61..f5358bcc 100644
--- a/lib/Db/StreamRequestBuilder.php
+++ b/lib/Db/StreamRequestBuilder.php
@@ -410,6 +410,18 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 
 		try {
 			$action = $this->parseStreamActionsLeftJoin($data);
+			if ($item->hasCache()) {
+				$cache = $item->getCache();
+				if ($cache->hasItem($action->getStreamId())) {
+					$cachedItem = $item->getCache()
+									   ->getItem($action->getStreamId());
+					$cachedObject = $cachedItem->getObject();
+					$cachedObject['action'] = $action;
+					$cachedItem->setContent(json_encode($cachedObject));
+					$cache->updateItem($cachedItem, false);
+				}
+			}
+
 			$item->setAction($action);
 		} catch (InvalidResourceException $e) {
 		}
diff --git a/lib/Model/ActivityPub/Stream.php b/lib/Model/ActivityPub/Stream.php
index 8c40d0bf..3cf7a5cc 100644
--- a/lib/Model/ActivityPub/Stream.php
+++ b/lib/Model/ActivityPub/Stream.php
@@ -228,7 +228,7 @@ class Stream extends ACore implements JsonSerializable {
 	/**
 	 * @return bool
 	 */
-	public function gotCache(): bool {
+	public function hasCache(): bool {
 		return ($this->cache !== null);
 	}
 
@@ -254,7 +254,7 @@ class Stream extends ACore implements JsonSerializable {
 	public function addCacheItem(string $url): Stream {
 		$cacheItem = new CacheItem($url);
 
-		if (!$this->gotCache()) {
+		if (!$this->hasCache()) {
 			$this->setCache(new Cache());
 		}
 
@@ -373,7 +373,7 @@ class Stream extends ACore implements JsonSerializable {
 				$result,
 				[
 					'action'        => ($this->hasAction()) ? $this->getAction() : [],
-					'cache'         => ($this->gotCache()) ? $this->getCache() : '',
+					'cache'         => ($this->hasCache()) ? $this->getCache() : '',
 					'publishedTime' => $this->getPublishedTime()
 				]
 			);
diff --git a/lib/Service/StreamQueueService.php b/lib/Service/StreamQueueService.php
index a3308eca..ab14666b 100644
--- a/lib/Service/StreamQueueService.php
+++ b/lib/Service/StreamQueueService.php
@@ -177,7 +177,7 @@ class StreamQueueService {
 			return;
 		}
 
-		if (!$stream->gotCache()) {
+		if (!$stream->hasCache()) {
 			$this->deleteCache($queue);
 
 			return;

From c5f9828788769b7ad795fc1bed9554a9388b06da Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Wed, 29 May 2019 23:35:30 +0200
Subject: [PATCH 07/11] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20correctly=20toggle?=
 =?UTF-8?q?=20boosted=20state=20when=20boosting=20an=20Announce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/store/timeline.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/timeline.js b/src/store/timeline.js
index 5144a6bd..b532ab86 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -59,7 +59,7 @@ const mutations = {
 			Vue.set(state.timeline[post.id].action.values, 'boosted', true)
 		}
 		if (parentAnnounce) {
-			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', true)
+			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].object.action.values, 'boosted', true)
 		}
 	},
 	unboostPost(state, { post, parentAnnounce }) {
@@ -67,7 +67,7 @@ const mutations = {
 			Vue.set(state.timeline[post.id].action.values, 'boosted', false)
 		}
 		if (parentAnnounce) {
-			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].action.values, 'boosted', false)
+			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].object.action.values, 'boosted', false)
 		}
 	}
 }

From d7baae9735bcc8f97a330447ab0d2321ba3ddf67 Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Wed, 29 May 2019 23:58:16 +0200
Subject: [PATCH 08/11] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20eslint=20&&=20norma?=
 =?UTF-8?q?l=20boost=20(parentAnnounce=20check)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineEntry.vue | 2 +-
 src/store/timeline.js            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index b5862b30..e635ccd5 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="timeline-entry">
 		<div v-if="item.type === 'Announce'" class="boost">
-			<span class="icon-boost"></span>
+			<span class="icon-boost" />
 			<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
 				<span v-tooltip.bottom="item.actor_info.account" class="post-author">
 					{{ userDisplayName(item.actor_info) }}
diff --git a/src/store/timeline.js b/src/store/timeline.js
index b532ab86..accf5a7b 100644
--- a/src/store/timeline.js
+++ b/src/store/timeline.js
@@ -55,18 +55,18 @@ const mutations = {
 		state.account = account
 	},
 	boostPost(state, { post, parentAnnounce }) {
-		if (!typeof state.timeline[post.id] === 'undefined') {
+		if (typeof state.timeline[post.id] !== 'undefined') {
 			Vue.set(state.timeline[post.id].action.values, 'boosted', true)
 		}
-		if (parentAnnounce) {
+		if (typeof parentAnnounce.id !== 'undefined') {
 			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].object.action.values, 'boosted', true)
 		}
 	},
 	unboostPost(state, { post, parentAnnounce }) {
-		if (!typeof state.timeline[post.id] === 'undefined') {
+		if (typeof state.timeline[post.id] !== 'undefined') {
 			Vue.set(state.timeline[post.id].action.values, 'boosted', false)
 		}
-		if (parentAnnounce) {
+		if (typeof parentAnnounce.id !== 'undefined') {
 			Vue.set(state.timeline[parentAnnounce.id].cache[parentAnnounce.object].object.action.values, 'boosted', false)
 		}
 	}

From 2dca0728e9d00fda1572d5ed51094afa1e10543e Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 29 May 2019 21:40:51 -0100
Subject: [PATCH 09/11] cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Db/StreamRequestBuilder.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php
index f5358bcc..89a71028 100644
--- a/lib/Db/StreamRequestBuilder.php
+++ b/lib/Db/StreamRequestBuilder.php
@@ -30,6 +30,7 @@ declare(strict_types=1);
 namespace OCA\Social\Db;
 
 
+use daita\MySmallPhpTools\Exceptions\CacheItemNotFoundException;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use Doctrine\DBAL\Query\QueryBuilder;
 use OCA\Social\Exceptions\InvalidResourceException;
@@ -408,24 +409,21 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 		} catch (InvalidResourceException $e) {
 		}
 
-		try {
-			$action = $this->parseStreamActionsLeftJoin($data);
-			if ($item->hasCache()) {
-				$cache = $item->getCache();
-				if ($cache->hasItem($action->getStreamId())) {
-					$cachedItem = $item->getCache()
-									   ->getItem($action->getStreamId());
-					$cachedObject = $cachedItem->getObject();
-					$cachedObject['action'] = $action;
-					$cachedItem->setContent(json_encode($cachedObject));
-					$cache->updateItem($cachedItem, false);
-				}
+		$action = $this->parseStreamActionsLeftJoin($data);
+		if ($item->hasCache()) {
+			$cache = $item->getCache();
+			try {
+				$cachedItem = $cache->getItem($action->getStreamId());
+				$cachedObject = $cachedItem->getObject();
+				$cachedObject['action'] = $action;
+				$cachedItem->setContent(json_encode($cachedObject));
+				$cache->updateItem($cachedItem, false);
+			} catch (CacheItemNotFoundException $e) {
 			}
-
-			$item->setAction($action);
-		} catch (InvalidResourceException $e) {
 		}
 
+		$item->setAction($action);
+
 		return $item;
 	}
 

From 8e7d1f7d7e981de248f92962e555b3fb9b175fd8 Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Thu, 30 May 2019 00:57:58 +0200
Subject: [PATCH 10/11] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20add=20padding?=
 =?UTF-8?q?=20between=20boost=20icon=20and=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineEntry.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index e635ccd5..5b2b9997 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,7 +1,9 @@
 <template>
 	<div class="timeline-entry">
 		<div v-if="item.type === 'Announce'" class="boost">
-			<span class="icon-boost" />
+			<div class="container-icon-boost">
+				<span class="icon-boost" />
+			</div>
 			<router-link v-if="item.actor_info" :to="{ name: 'profile', params: { account: item.local ? item.actor_info.preferredUsername : item.actor_info.account }}">
 				<span v-tooltip.bottom="item.actor_info.account" class="post-author">
 					{{ userDisplayName(item.actor_info) }}
@@ -64,9 +66,14 @@ export default {
 		margin-bottom: 10px;
 	}
 
+	.container-icon-boost {
+		display: inline-block;
+		padding-right: 6px;
+	}
+
 	.icon-boost {
 		display: inline-block;
-		width: 44px;
+		width: 38px;
 		height: 17px;
 		opacity: .5;
 		background-position: right center;

From e2b9ed22e5e09d67318319bfda5ac6cbd2d33170 Mon Sep 17 00:00:00 2001
From: Jonas Sulzer <jonas@violoncello.ch>
Date: Thu, 30 May 2019 01:32:41 +0200
Subject: [PATCH 11/11] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20don't=20display?=
 =?UTF-8?q?=20Announce=20if=20original=20Note=20is=20already=20present=20i?=
 =?UTF-8?q?n=20stream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
---
 src/components/TimelineEntry.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 5b2b9997..a88147a3 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="timeline-entry">
+	<div v-if="noDuplicateBoost" class="timeline-entry">
 		<div v-if="item.type === 'Announce'" class="boost">
 			<div class="container-icon-boost">
 				<span class="icon-boost" />
@@ -51,6 +51,16 @@ export default {
 		},
 		boosted() {
 			return t('social', 'boosted')
+		},
+		noDuplicateBoost() {
+			if (this.item.type === 'Announce') {
+				for (var e in this.$store.state.timeline.timeline) {
+					if (this.item.cache[this.item.object].object.id === e) {
+						return false
+					}
+				}
+			}
+			return true
 		}
 	},
 	methods: {