Merge branch 'notifications' into 'develop'

Support qvitter api notifications

Closes #129

See merge request pleroma/pleroma-fe!306

1 files changed, 21 insertions, 7 deletions

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index f8314bfc..b24250b0 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,16 +1,21 @@
 import Notification from '../notification/notification.vue'
+import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 
-import { sortBy, take, filter } from 'lodash'
+import { sortBy, filter } from 'lodash'
 
 const Notifications = {
-  data () {
-    return {
-      visibleNotificationCount: 20
-    }
+  created () {
+    const store = this.$store
+    const credentials = store.state.users.currentUser.credentials
+
+    notificationsFetcher.startFetching({ store, credentials })
   },
   computed: {
     notifications () {
-      return this.$store.state.statuses.notifications
+      return this.$store.state.statuses.notifications.data
+    },
+    error () {
+      return this.$store.state.statuses.notifications.error
     },
     unseenNotifications () {
       return filter(this.notifications, ({seen}) => !seen)
@@ -19,7 +24,7 @@ const Notifications = {
       // Don't know why, but sortBy([seen, -action.id]) doesn't work.
       let sortedNotifications = sortBy(this.notifications, ({action}) => -action.id)
       sortedNotifications = sortBy(sortedNotifications, 'seen')
-      return take(sortedNotifications, this.visibleNotificationCount)
+      return sortedNotifications
     },
     unseenCount () {
       return this.unseenNotifications.length
@@ -40,6 +45,15 @@ const Notifications = {
   methods: {
     markAsSeen () {
       this.$store.commit('markNotificationsAsSeen', this.visibleNotifications)
+    },
+    fetchOlderNotifications () {
+      const store = this.$store
+      const credentials = store.state.users.currentUser.credentials
+      notificationsFetcher.fetchAndUpdate({
+        store,
+        credentials,
+        older: true
+      })
     }
   }
 }