pleroma-fe

commit: 96753e6a5febff60e0c2cb6fac13d5e7865f0a94
parent: 987b5162a7530979e9fa887a24311eb1cd480fc5
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Wed, 27 Mar 2019 08:51:35 +0000

Merge branch 'revert-987b5162' into 'develop'

Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"

See merge request pleroma/pleroma-fe!710
Diffstat:
M
src/services/api/api.service.js
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
@@ -1,5 +1,6 @@
 /* eslint-env browser */
 const LOGIN_URL = '/api/account/verify_credentials.json'
+const FRIENDS_TIMELINE_URL = '/api/statuses/friends_timeline.json'
 const ALL_FOLLOWING_URL = '/api/qvitter/allfollowing'
 const PUBLIC_TIMELINE_URL = '/api/statuses/public_timeline.json'
 const PUBLIC_AND_EXTERNAL_TIMELINE_URL = '/api/statuses/public_and_external_timeline.json'
@@ -32,7 +33,6 @@ const DENY_USER_URL = '/api/pleroma/friendships/deny'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
-const MASTODON_USER_HOME_TIMELINE_URL = '/api/v1/timelines/home'
 const MASTODON_STATUS_URL = id => `/api/v1/statuses/${id}`
 const MASTODON_STATUS_CONTEXT_URL = id => `/api/v1/statuses/${id}/context`
 const MASTODON_USER_URL = '/api/v1/accounts'
@@ -348,7 +348,7 @@ const fetchStatus = ({id, credentials}) => {
 const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false, withMuted = false}) => {
   const timelineUrls = {
     public: PUBLIC_TIMELINE_URL,
-    friends: MASTODON_USER_HOME_TIMELINE_URL,
+    friends: FRIENDS_TIMELINE_URL,
     mentions: MENTIONS_URL,
     dms: DM_TIMELINE_URL,
     notifications: QVITTER_USER_NOTIFICATIONS_URL,