1 files changed, 14 insertions, 3 deletions
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 4ee95bd1..48e5d480 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -41,7 +41,10 @@ const APPROVE_USER_URL = '/api/pleroma/friendships/approve'
 const DENY_USER_URL = '/api/pleroma/friendships/deny'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 
+const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
+
 import { each, map } from 'lodash'
+import { parseStatus } from '../status_normalizer/status_normalizer.service.js'
 import 'whatwg-fetch'
 
 const oldfetch = window.fetch
@@ -70,6 +73,7 @@ const updateAvatar = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -87,6 +91,7 @@ const updateBg = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -110,6 +115,7 @@ const updateBanner = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -267,12 +273,14 @@ const fetchConversation = ({id, credentials}) => {
   let url = `${CONVERSATION_URL}/${id}.json?count=100`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => data.map(parseStatus))
 }
 
 const fetchStatus = ({id, credentials}) => {
   let url = `${STATUS_URL}/${id}.json`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => parseStatus(data))
 }
 
 const setUserMute = ({id, credentials, muted = true}) => {
@@ -300,12 +308,14 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     notifications: QVITTER_USER_NOTIFICATIONS_URL,
     'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
     user: QVITTER_USER_TIMELINE_URL,
+    favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
     tag: TAG_TIMELINE_URL
   }
+  const type = timeline.type || timeline
+  const isNotifications = type === 'notifications'
+  const params = []
 
-  let url = timelineUrls[timeline]
-
-  let params = []
+  let url = timelineUrls[type]
 
   if (since) {
     params.push(['since_id', since])
@@ -333,6 +343,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
       throw new Error('Error fetching timeline')
     })
     .then((data) => data.json())
+    .then((data) => data.map(isNotifications ? _ => _ : parseStatus))
 }
 
 const verifyCredentials = (user) => {