commit: e750b2f197b03ec78ad9a3544244bba906f319c4
parent: 96753e6a5febff60e0c2cb6fac13d5e7865f0a94
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Wed, 27 Mar 2019 08:54:57 +0000
Merge branch 'mastoapi/public-tl' into 'develop'
switch public and TWKN to MastoAPI
See merge request pleroma/pleroma-fe!650
Diffstat:
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
@@ -2,8 +2,6 @@
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'
const TAG_TIMELINE_URL = '/api/statusnet/tags/timeline'
const FAVORITE_URL = '/api/favorites/create'
const UNFAVORITE_URL = '/api/favorites/destroy'
@@ -33,6 +31,7 @@ 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_PUBLIC_TIMELINE = '/api/v1/timelines/public'
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'
@@ -347,12 +346,12 @@ const fetchStatus = ({id, credentials}) => {
const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false, withMuted = false}) => {
const timelineUrls = {
- public: PUBLIC_TIMELINE_URL,
+ public: MASTODON_PUBLIC_TIMELINE,
friends: FRIENDS_TIMELINE_URL,
mentions: MENTIONS_URL,
dms: DM_TIMELINE_URL,
notifications: QVITTER_USER_NOTIFICATIONS_URL,
- 'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
+ 'publicAndExternal': MASTODON_PUBLIC_TIMELINE,
user: MASTODON_USER_TIMELINE_URL,
media: MASTODON_USER_TIMELINE_URL,
favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
@@ -379,6 +378,12 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
if (timeline === 'media') {
params.push(['only_media', 1])
}
+ if (timeline === 'public') {
+ params.push(['local', true])
+ }
+ if (timeline === 'public' || timeline === 'publicAndExternal') {
+ params.push(['only_media', false])
+ }
params.push(['count', 20])
params.push(['with_muted', withMuted])