From 145b4e1e521f315f744183304bc2464794f74cbb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 25 Jun 2020 16:06:17 +0200
Subject: [PATCH] Notifications: Use notifications natively.

---
 .../follow_request_card.js                    |  2 +-
 src/components/notification/notification.js   | 20 +++----
 src/components/notification/notification.vue  | 54 +++++++++----------
 .../notifications/notifications.vue           |  4 +-
 src/modules/statuses.js                       | 34 ++++++------
 src/modules/users.js                          |  5 +-
 .../entity_normalizer.service.js              | 42 ++-------------
 .../notification_utils/notification_utils.js  | 24 ++++-----
 8 files changed, 76 insertions(+), 109 deletions(-)

diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index 365e765a..cbd75311 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -22,7 +22,7 @@ const FollowRequestCard = {
       this.$store.dispatch('updateNotification', {
         id: notifId,
         updater: notification => {
-          notification.redux.type = 'follow'
+          notification.type = 'follow'
         }
       })
     },
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 6bbf9a6e..f89a35d4 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -31,7 +31,7 @@ const Notification = {
       return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
     },
     getUser (notification) {
-      return this.$store.state.users.usersObject[notification.redux.account.id]
+      return this.$store.state.users.usersObject[notification.account.id]
     },
     toggleMute () {
       this.unmuted = !this.unmuted
@@ -39,39 +39,39 @@ const Notification = {
     approveUser () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
-      this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.redux.id })
+      this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
       this.$store.dispatch('updateNotification', {
-        id: this.notification.redux.id,
+        id: this.notification.id,
         updater: notification => {
-          notification.redux.type = 'follow'
+          notification.type = 'follow'
         }
       })
     },
     denyUser () {
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
-          this.$store.dispatch('dismissNotificationLocal', { id: this.notification.redux.id })
+          this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
     }
   },
   computed: {
     userClass () {
-      return highlightClass(this.notification.redux.account)
+      return highlightClass(this.notification.account)
     },
     userStyle () {
       const highlight = this.$store.getters.mergedConfig.highlight
-      const user = this.notification.redux.account
+      const user = this.notification.account
       return highlightStyle(highlight[user.screen_name])
     },
     user () {
-      return this.$store.getters.findUser(this.notification.redux.account.id)
+      return this.$store.getters.findUser(this.notification.account.id)
     },
     userProfileLink () {
       return this.generateUserProfileLink(this.user)
     },
     targetUser () {
-      return this.$store.getters.findUser(this.notification.redux.target.id)
+      return this.$store.getters.findUser(this.notification.target.id)
     },
     targetUserProfileLink () {
       return this.generateUserProfileLink(this.targetUser)
@@ -80,7 +80,7 @@ const Notification = {
       return this.$store.getters.relationship(this.user.id).muting
     },
     isStatusNotification () {
-      return (this.notification.redux.type)
+      return (this.notification.type)
     }
   }
 }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 93cda80c..2b1f548d 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -1,8 +1,8 @@
 <template>
   <status
-    v-if="notification.redux.type === 'mention'"
+    v-if="notification.type === 'mention'"
     :compact="true"
-    :statusoid="notification.redux.status"
+    :statusoid="notification.status"
   />
   <div v-else>
     <div
@@ -11,7 +11,7 @@
     >
       <small>
         <router-link :to="userProfileLink">
-          {{ notification.redux.account.redux.acct }}
+          {{ notification.account.redux.acct }}
         </router-link>
       </small>
       <a
@@ -28,13 +28,13 @@
     >
       <a
         class="avatar-container"
-        :href="notification.redux.account.redux.url"
+        :href="notification.account.redux.url"
         @click.stop.prevent.capture="toggleUserExpanded"
       >
         <UserAvatar
           :compact="true"
           :better-shadow="betterShadow"
-          :user="notification.redux.account"
+          :user="notification.account"
         />
       </a>
       <div class="notification-right">
@@ -48,44 +48,44 @@
           <div class="name-and-action">
             <!-- eslint-disable vue/no-v-html -->
             <bdi
-              v-if="!!notification.redux.account.name_html"
+              v-if="!!notification.account.name_html"
               class="username"
-              :title="'@'+notification.redux.account.screen_name"
-              v-html="notification.redux.account.name_html"
+              :title="'@'+notification.account.screen_name"
+              v-html="notification.account.name_html"
             />
             <!-- eslint-enable vue/no-v-html -->
             <span
               v-else
               class="username"
-              :title="'@'+notification.redux.account.redux.acct"
-            >{{ notification.redux.account.display_name }}</span>
-            <span v-if="notification.redux.type === 'favourite'">
+              :title="'@'+notification.account.redux.acct"
+            >{{ notification.account.display_name }}</span>
+            <span v-if="notification.type === 'favourite'">
               <i class="fa icon-star lit" />
               <small>{{ $t('notifications.favorited_you') }}</small>
             </span>
-            <span v-if="notification.redux.type === 'reblog'">
+            <span v-if="notification.type === 'reblog'">
               <i
                 class="fa icon-retweet lit"
                 :title="$t('tool_tip.repeat')"
               />
               <small>{{ $t('notifications.repeated_you') }}</small>
             </span>
-            <span v-if="notification.redux.type === 'follow'">
+            <span v-if="notification.type === 'follow'">
               <i class="fa icon-user-plus lit" />
               <small>{{ $t('notifications.followed_you') }}</small>
             </span>
-            <span v-if="notification.redux.type === 'follow_request'">
+            <span v-if="notification.type === 'follow_request'">
               <i class="fa icon-user lit" />
               <small>{{ $t('notifications.follow_request') }}</small>
             </span>
-            <span v-if="notification.redux.type === 'move'">
+            <span v-if="notification.type === 'move'">
               <i class="fa icon-arrow-curved lit" />
               <small>{{ $t('notifications.migrated_to') }}</small>
             </span>
-            <span v-if="notification.redux.type === 'pleroma:emoji_reaction'">
+            <span v-if="notification.type === 'pleroma:emoji_reaction'">
               <small>
                 <i18n path="notifications.reacted_with">
-                  <span class="emoji-reaction-emoji">{{ notification.redux.emoji }}</span>
+                  <span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
                 </i18n>
               </small>
             </span>
@@ -95,12 +95,12 @@
             class="timeago"
           >
             <router-link
-              v-if="notification.redux.status"
-              :to="{ name: 'conversation', params: { id: notification.redux.status.id } }"
+              v-if="notification.status"
+              :to="{ name: 'conversation', params: { id: notification.status.id } }"
               class="faint-link"
             >
               <Timeago
-                :time="notification.redux.created_at"
+                :time="notification.created_at"
                 :auto-update="240"
               />
             </router-link>
@@ -111,7 +111,7 @@
           >
             <span class="faint">
               <Timeago
-                :time="notification.redux.created_at"
+                :time="notification.created_at"
                 :auto-update="240"
               />
             </span>
@@ -123,17 +123,17 @@
           ><i class="button-icon icon-eye-off" /></a>
         </span>
         <div
-          v-if="notification.redux.type === 'follow' || notification.redux.type === 'follow_request'"
+          v-if="notification.type === 'follow' || notification.type === 'follow_request'"
           class="follow-text"
         >
           <router-link
             :to="userProfileLink"
             class="follow-name"
           >
-            @{{ notification.redux.account.redux.acct }}
+            @{{ notification.account.redux.acct }}
           </router-link>
           <div
-            v-if="notification.redux.type === 'follow_request'"
+            v-if="notification.type === 'follow_request'"
             style="white-space: nowrap;"
           >
             <i
@@ -149,17 +149,17 @@
           </div>
         </div>
         <div
-          v-else-if="notification.redux.type === 'move'"
+          v-else-if="notification.type === 'move'"
           class="move-text"
         >
           <router-link :to="targetUserProfileLink">
-            @{{ notification.redux.target.redux.acct }}
+            @{{ notification.target.redux.acct }}
           </router-link>
         </div>
         <template v-else>
           <status-content
             class="faint"
-            :status="notification.redux.status"
+            :status="notification.status"
           />
         </template>
       </div>
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 18479ebb..103a5722 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -33,9 +33,9 @@
       <div class="panel-body">
         <div
           v-for="notification in notificationsToDisplay"
-          :key="notification.redux.id"
+          :key="notification.id"
           class="notification"
-          :class="{&quot;unseen&quot;: !minimalMode && !notification.redux.pleroma.is_seen}"
+          :class="{&quot;unseen&quot;: !minimalMode && !notification.pleroma.is_seen}"
         >
           <div class="notification-overlay" />
           <notification :notification="notification" />
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 25252fcf..54ae1054 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -311,35 +311,35 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
 const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters }) => {
   each(notifications, (notification) => {
-    if (isStatusNotification(notification.redux.type)) {
-      notification.redux.status = notification.redux.status && addStatusToGlobalStorage(state, notification.redux.status).item
+    if (isStatusNotification(notification.type)) {
+      notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
     }
 
-    if (notification.redux.type === 'pleroma:emoji_reaction') {
-      dispatch('fetchEmojiReactionsBy', notification.redux.status.id)
+    if (notification.type === 'pleroma:emoji_reaction') {
+      dispatch('fetchEmojiReactionsBy', notification.status.id)
     }
 
     // Only add a new notification if we don't have one for the same action
-    if (!state.notifications.idStore.hasOwnProperty(notification.redux.id)) {
-      state.notifications.maxId = notification.redux.id > state.notifications.maxId
-        ? notification.redux.id
+    if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
+      state.notifications.maxId = notification.id > state.notifications.maxId
+        ? notification.id
         : state.notifications.maxId
-      state.notifications.minId = notification.redux.id < state.notifications.minId
-        ? notification.redux.id
+      state.notifications.minId = notification.id < state.notifications.minId
+        ? notification.id
         : state.notifications.minId
 
       state.notifications.data.push(notification)
-      state.notifications.idStore[notification.redux.id] = notification
+      state.notifications.idStore[notification.id] = notification
 
       if ('Notification' in window && window.Notification.permission === 'granted') {
         const notifObj = prepareNotificationObject(notification, rootGetters.i18n)
 
         const reasonsToMuteNotif = (
-          notification.redux.pleroma.is_seen ||
+          notification.pleroma.is_seen ||
             state.notifications.desktopNotificationSilence ||
-            !visibleNotificationTypes.includes(notification.redux.type) ||
+            !visibleNotificationTypes.includes(notification.type) ||
             (
-              notification.redux.type === 'mention' && status && (
+              notification.type === 'mention' && status && (
                 status.muted ||
                   muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
               )
@@ -352,8 +352,8 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
           setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
         }
       }
-    } else if (notification.redux.pleroma.is_seen) {
-      state.notifications.idStore[notification.redux.id].pleroma.is_seen = true
+    } else if (notification.pleroma.is_seen) {
+      state.notifications.idStore[notification.id].pleroma.is_seen = true
     }
   })
 }
@@ -486,12 +486,12 @@ export const mutations = {
   },
   markNotificationsAsSeen (state) {
     each(state.notifications.data, (notification) => {
-      notification.redux.pleroma.is_seen = true
+      notification.pleroma.is_seen = true
     })
   },
   markSingleNotificationAsSeen (state, { id }) {
     const notification = find(state.notifications.data, n => n.id === id)
-    if (notification) notification.redux.pleroma.is_seen = true
+    if (notification) notification.pleroma.is_seen = true
   },
   dismissNotification (state, { id }) {
     state.notifications.data = state.notifications.data.filter(n => n.id !== id)
diff --git a/src/modules/users.js b/src/modules/users.js
index 0f05113f..f8c8f401 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -206,8 +206,7 @@ export const mutations = {
     status.user = state.usersObject[status.user.id]
   },
   setUserForNotification (state, notification) {
-    notification.from_profile = state.usersObject[notification.from_profile.id]
-    notification.redux.account = state.usersObject[notification.redux.account.id]
+    notification.account = state.usersObject[notification.account.id]
   },
   setColor (state, { user: { id }, highlighted }) {
     const user = state.usersObject[id]
@@ -410,7 +409,7 @@ const users = {
       })
     },
     addNewNotifications (store, { notifications }) {
-      const users = map(notifications, 'from_profile')
+      const users = map(notifications, 'account')
       const targetUsers = map(notifications, 'target').filter(_ => _)
       const notificationIds = notifications.map(_ => _.id)
       store.commit('addNewUsers', users)
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index c67bb026..590505ed 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -329,44 +329,12 @@ export const parseStatus = (data) => {
 }
 
 export const parseNotification = (data) => {
-  const mastoDict = {
-    'favourite': 'like',
-    'reblog': 'repeat'
-  }
-  const masto = !data.hasOwnProperty('ntype')
-  const output = {}
+  const redux = data
+  redux.account = parseUser(data.account)
+  redux.status = isStatusNotification(data.type) ? parseStatus(data.status) : null
+  redux.target = data.type !== 'move' ? null : parseUser(data.target)
 
-  if (masto) {
-    output.type = mastoDict[data.type] || data.type
-    output.seen = data.pleroma.is_seen
-    output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
-    output.action = output.status // TODO: Refactor, this is unneeded
-    output.target = output.type !== 'move'
-      ? null
-      : parseUser(data.target)
-    output.from_profile = parseUser(data.account)
-    output.emoji = data.emoji
-  } else {
-    const parsedNotice = parseStatus(data.notice)
-    output.type = data.ntype
-    output.seen = Boolean(data.is_seen)
-    output.status = output.type === 'like'
-      ? parseStatus(data.notice.favorited_status)
-      : parsedNotice
-    output.action = parsedNotice
-    output.from_profile = parseUser(data.from_profile)
-  }
-
-  output.created_at = new Date(data.created_at)
-  output.id = parseInt(data.id)
-
-  output.redux = data
-  output.redux.account = parseUser(data.account)
-  output.redux.status = isStatusNotification(data.type) ? parseStatus(data.status) : null
-  output.redux.target = output.type !== 'move' ? null : parseUser(data.target)
-  console.log(output.redux.pleroma.is_seen)
-
-  return output
+  return redux
 }
 
 const isNsfw = (status) => {
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 23f82ba1..8b44fc69 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -35,25 +35,25 @@ const sortById = (a, b) => {
 export const filteredNotificationsFromStore = (store, types) => {
   // map is just to clone the array since sort mutates it and it causes some issues
   let sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)
-  sortedNotifications = sortBy(sortedNotifications, 'seen')
+  sortedNotifications = sortBy(sortedNotifications, 'pleroma.is_seen')
   return sortedNotifications.filter(
-    (notification) => (types || visibleTypes(store.state)).includes(notification.redux.type)
+    (notification) => (types || visibleTypes(store.state)).includes(notification.type)
   )
 }
 
 export const unseenNotificationsFromStore = store =>
-  filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
+  filter(filteredNotificationsFromStore(store), ({ pleroma }) => !pleroma.is_seen)
 
 export const prepareNotificationObject = (notification, i18n) => {
   const notifObj = {
-    tag: notification.redux.id
+    tag: notification.id
   }
-  const status = notification.redux.status
-  const title = notification.redux.account.name
+  const status = notification.status
+  const title = notification.account.name
   notifObj.title = title
-  notifObj.icon = notification.redux.account.profile_image_url
+  notifObj.icon = notification.account.profile_image_url
   let i18nString
-  switch (notification.redux.type) {
+  switch (notification.type) {
     case 'favourite':
       i18nString = 'favorited_you'
       break
@@ -71,12 +71,12 @@ export const prepareNotificationObject = (notification, i18n) => {
       break
   }
 
-  if (notification.redux.type === 'pleroma:emoji_reaction') {
-    notifObj.body = i18n.t('notifications.reacted_with', [notification.redux.emoji])
+  if (notification.type === 'pleroma:emoji_reaction') {
+    notifObj.body = i18n.t('notifications.reacted_with', [notification.emoji])
   } else if (i18nString) {
     notifObj.body = i18n.t('notifications.' + i18nString)
-  } else if (isStatusNotification(notification.redux.type)) {
-    notifObj.body = notification.redux.status.text
+  } else if (isStatusNotification(notification.type)) {
+    notifObj.body = notification.status.text
   }
 
   // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...