diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:53:56 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:53:56 +0000 |
| commit | f6e779a084a858da3461265a9a85ef40a6a433fb (patch) | |
| tree | c8178a76a0f7a5cf4817abeae8ab263375683e6d | |
| parent | 3870adf51ff736617f48619d16553010d5e9c9b0 (diff) | |
| parent | ea50f55148f059549a586fb136eaa62963e33e66 (diff) | |
Merge branch 'masto-api/direct' into 'develop'
switch direct messages to mastoapi
See merge request pleroma/pleroma-fe!649
| -rw-r--r-- | src/services/api/api.service.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index aabbe80f..c2949a04 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -8,7 +8,6 @@ const RETWEET_URL = '/api/statuses/retweet' const UNRETWEET_URL = '/api/statuses/unretweet' const STATUS_DELETE_URL = '/api/statuses/destroy' const MENTIONS_URL = '/api/statuses/mentions.json' -const DM_TIMELINE_URL = '/api/statuses/dm_timeline.json' const FOLLOWERS_URL = '/api/statuses/followers.json' const FRIENDS_URL = '/api/statuses/friends.json' const FOLLOWING_URL = '/api/friendships/create.json' @@ -30,6 +29,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_DIRECT_MESSAGES_TIMELINE_URL = '/api/v1/timelines/direct' const MASTODON_PUBLIC_TIMELINE = '/api/v1/timelines/public' const MASTODON_USER_HOME_TIMELINE_URL = '/api/v1/timelines/home' const MASTODON_STATUS_URL = id => `/api/v1/statuses/${id}` @@ -349,7 +349,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use public: MASTODON_PUBLIC_TIMELINE, friends: MASTODON_USER_HOME_TIMELINE_URL, mentions: MENTIONS_URL, - dms: DM_TIMELINE_URL, + dms: MASTODON_DIRECT_MESSAGES_TIMELINE_URL, notifications: QVITTER_USER_NOTIFICATIONS_URL, 'publicAndExternal': MASTODON_PUBLIC_TIMELINE, user: MASTODON_USER_TIMELINE_URL, |
