Merge remote-tracking branch 'origin/feature/noid/notifications' into feature/noid/notifications

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

src/components/TimelineEntry.vue

@@ -1,6 +1,9 @@
 <template>
-	<div v-if="noDuplicateBoost" class="timeline-entry">
-		<div v-if="item.type === 'Announce'" class="boost">
+	<div class="timeline-entry">
+		<div v-if="item.type === 'SocialAppNotification'">
+			{{ actionSummary }}
+		</div>
+		<div v-if="item.type === 'Announce' && noDuplicateBoost" class="boost">
 			<div class="container-icon-boost">
 				<span class="icon-boost" />
 			</div>
@@ -16,17 +19,20 @@
 			</a>
 			{{ boosted }}
 		</div>
-		<timeline-content :item="entryContent" :parent-announce="isBoost" />
+		<timeline-post v-if="noDuplicateBoost && item.type === 'Note | Announce'" :item="entryContent" :parent-announce="isBoost" />
+		<user-entry v-if="item.type === 'SocialAppNotificationUser'" :key="user.id" :item="user" />
 	</div>
 </template>
 
 <script>
-import TimelineContent from './TimelineContent.vue'
+import TimelinePost from './TimelinePost'
+import UserEntry from './UserEntry'
 
 export default {
 	name: 'TimelineEntry',
 	components: {
-		TimelineContent
+		TimelinePost,
+		UserEntry
 	},
 	props: {
 		item: { type: Object, default: () => {} }
@@ -61,6 +67,9 @@ export default {
 				}
 			}
 			return true
+		},
+		actionSummary() {
+			return this.item.summary.replace('{account}', this.item.details.account)
 		}
 	},
 	methods: {

src/components/TimelineList.vue

@@ -57,9 +57,9 @@
 
 <script>
 import InfiniteLoading from 'vue-infinite-loading'
-import TimelineEntry from './../components/TimelineEntry'
+import TimelineEntry from './TimelineEntry'
 import CurrentUserMixin from './../mixins/currentUserMixin'
-import EmptyContent from './../components/EmptyContent'
+import EmptyContent from './EmptyContent'
 
 export default {
 	name: 'Timeline',
@@ -69,6 +69,9 @@ export default {
 		EmptyContent
 	},
 	mixins: [CurrentUserMixin],
+	props: {
+		type: { type: String, default: () => 'home' }
+	},
 	data: function() {
 		return {
 			infoHidden: false,

src/components/TimelinePost.vue

@@ -58,7 +58,7 @@ pluginTag(linkify)
 pluginMention(linkify)
 
 export default {
-	name: 'TimelineContent',
+	name: 'TimelinePost',
 	components: {
 		Avatar
 	},

src/views/Timeline.vue

@@ -21,11 +21,11 @@
 				</div>
 			</div>
 		</transition>
-		<composer />
+		<composer v-if="type !== 'notifications'" />
 		<h2 v-if="type === 'tags'">
 			#{{ this.$route.params.tag }}
 		</h2>
-		<timeline-list />
+		<timeline-list :type="type" />
 	</div>
 </template>