Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Merge requests
!647
Switch friends TL to MastoAPI
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Switch friends TL to MastoAPI
mastoapi/friends-tl
into
develop
Overview
0
Commits
4
Pipelines
4
Changes
1
Merged
HJ
requested to merge
mastoapi/friends-tl
into
develop
6 years ago
Overview
0
Commits
4
Pipelines
4
Changes
1
Expand
0
0
Merge request reports
Compare
develop
version 3
fe13b1b7
6 years ago
version 2
c038d0c1
6 years ago
version 1
2e59ab73
6 years ago
develop (base)
and
latest version
latest version
04217fc6
4 commits,
6 years ago
version 3
fe13b1b7
3 commits,
6 years ago
version 2
c038d0c1
2 commits,
6 years ago
version 1
2e59ab73
1 commit,
6 years ago
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/services/api/api.service.js
+
2
−
2
Options
/* 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
'
@@ -33,6 +32,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_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
:
FRIENDS
_TIMELINE_URL
,
friends
:
MASTODON_USER_HOME
_TIMELINE_URL
,
mentions
:
MENTIONS_URL
,
dms
:
DM_TIMELINE_URL
,
notifications
:
QVITTER_USER_NOTIFICATIONS_URL
,
Loading