Skip to content
Snippets Groups Projects
Commit 96753e6a authored by HJ's avatar HJ :fire:
Browse files

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

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

See merge request !710
parents 987b5162 95459ff0
No related branches found
No related tags found
2 merge requests!1028`master` refresh with `develop`,!710Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Pipeline #9499 passed
/* 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,
......
  • HJ :fire: @hj

    mentioned in commit bab4d3d0

    ·

    mentioned in commit bab4d3d0

    Toggle commit list
  • HJ :fire: @hj

    mentioned in commit b3a6bec1

    ·

    mentioned in commit b3a6bec1

    Toggle commit list
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment