3 files changed, 77 insertions, 57 deletions
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index f8314bfc..58956f98 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,25 +1,38 @@
 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: {
+    visibleTypes () {
+      return [
+        this.$store.state.config.notificationVisibility.likes && 'like',
+        this.$store.state.config.notificationVisibility.mentions && 'mention',
+        this.$store.state.config.notificationVisibility.repeats && 'repeat',
+        this.$store.state.config.notificationVisibility.follows && 'follow'
+      ].filter(_ => _)
+    },
     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)
+      return filter(this.visibleNotifications, ({seen}) => !seen)
     },
     visibleNotifications () {
       // 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.filter((notification) => this.visibleTypes.includes(notification.type))
     },
     unseenCount () {
       return this.unseenNotifications.length
@@ -40,6 +53,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
+      })
     }
   }
 }
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 008530b4..a137ccd5 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -4,49 +4,30 @@
   // a bit of a hack to allow scrolling below notifications
   padding-bottom: 15em;
 
-  .panel {
-    background: $fallback--bg;
-    background: var(--bg, $fallback--bg)
-  }
-
-  .panel-body {
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border)
-  }
-
-  .panel-heading {
-    // force the text to stay centered, while keeping
-    // the button in the right side of the panel heading
-    position: relative;
-    background: $fallback--btn;
-    background: var(--btn, $fallback--btn);
-    color: $fallback--fg;
-    color: var(--fg, $fallback--fg);
-    .read-button {
-      position: absolute;
-      right: 0.7em;
-      height: 1.8em;
-      line-height: 100%;
-    }
-  }
-
   .unseen-count {
     display: inline-block;
     background-color: $fallback--cRed;
     background-color: var(--cRed, $fallback--cRed);
     text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
-    min-width: 1.3em;
-    border-radius: 1.3em;
-    margin: 0 0.2em 0 -0.4em;
+    border-radius: 99px;
+    min-width: 22px;
+    max-width: 22px;
+    min-height: 22px;
+    max-height: 22px;
     color: white;
-    font-size: 0.9em;
+    font-size: 15px;
+    line-height: 22px;
     text-align: center;
-    line-height: 1.3em;
+    vertical-align: middle
+  }
+
+  .loadmore-error {
+    color: $fallback--fg;
+    color: var(--fg, $fallback--fg);
   }
 
   .unseen {
-    border-left: 4px solid $fallback--cRed;
-    border-left: 4px solid var(--cRed, $fallback--cRed);
+    box-shadow: inset 4px 0 0 var(--cRed, $fallback--cRed);
     padding-left: 0;
   }
 }
@@ -55,8 +36,18 @@
   box-sizing: border-box;
   display: flex;
   border-bottom: 1px solid;
-  border-bottom-color: inherit;
-  padding-left: 4px;
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+
+  .broken-favorite {
+    border-radius: $fallback--tooltipRadius;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    color: $fallback--faint;
+    color: var(--faint, $fallback--faint);
+    background-color: $fallback--cAlertRed;
+    background-color: var(--cAlertRed, $fallback--cAlertRed);
+    padding: 2px .5em
+  }
 
   .avatar-compact {
     width: 32px;
@@ -71,7 +62,7 @@
     }
   }
 
-  &:hover .animated.avatar {
+  &:hover .animated.avatar-compact {
     canvas {
       display: none;
     }
@@ -147,6 +138,13 @@
       max-width: 100%;
       text-overflow: ellipsis;
       white-space: nowrap;
+
+      img {
+        width: 14px;
+        height: 14px;
+        vertical-align: middle;
+        object-fit: contain
+      }
     }
     .timeago {
       float: right;
@@ -196,15 +194,4 @@
       margin-bottom: 0.3em;
     }
   }
-
-  // ugly as heck
-  &:last-child {
-    border-bottom: none;
-    border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-    border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    .status-el {
-      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    }
-  }
 }
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 4fa6e925..7a4322f9 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -2,8 +2,13 @@
   <div class="notifications">
     <div class="panel panel-default">
       <div class="panel-heading">
-        <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span>
-        {{$t('notifications.notifications')}}
+        <div class="title">
+          {{$t('notifications.notifications')}}
+          <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span>
+        </div>
+        <div @click.prevent class="loadmore-error alert error" v-if="error">
+          {{$t('timeline.error_fetching')}}
+        </div>
         <button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button>
       </div>
       <div class="panel-body">
@@ -11,6 +16,12 @@
           <notification :notification="notification"></notification>
         </div>
       </div>
+      <div class="panel-footer">
+        <a href="#" v-on:click.prevent='fetchOlderNotifications()' v-if="!notifications.loading">
+          <div class="new-status-notification text-center panel-footer">{{$t('notifications.load_older')}}</div>
+        </a>
+        <div class="new-status-notification text-center panel-footer" v-else>...</div>
+      </div>
     </div>
   </div>
 </template>