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
Commits
b3a6bec1
Commit
b3a6bec1
authored
6 years ago
by
HJ
Committed by
Roman Kostetskiy
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Merge branch 'revert-
987b5162
' into 'develop'"
This reverts commit
96753e6a
, reversing changes made to
987b5162
.
parent
e750b2f1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1028
`master` refresh with `develop`
,
!711
Mastoapi/friends tl
Pipeline
#9504
passed
6 years ago
Stage: lint
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/services/api/api.service.js
+2
-2
2 additions, 2 deletions
src/services/api/api.service.js
with
2 additions
and
2 deletions
src/services/api/api.service.js
+
2
−
2
View file @
b3a6bec1
/* 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
TAG_TIMELINE_URL
=
'
/api/statusnet/tags/timeline
'
const
FAVORITE_URL
=
'
/api/favorites/create
'
...
...
@@ -32,6 +31,7 @@ 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_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
'
...
...
@@ -347,7 +347,7 @@ const fetchStatus = ({id, credentials}) => {
const
fetchTimeline
=
({
timeline
,
credentials
,
since
=
false
,
until
=
false
,
userId
=
false
,
tag
=
false
,
withMuted
=
false
})
=>
{
const
timelineUrls
=
{
public
:
MASTODON_PUBLIC_TIMELINE
,
friends
:
FRIENDS
_TIMELINE_URL
,
friends
:
MASTODON_USER_HOME
_TIMELINE_URL
,
mentions
:
MENTIONS_URL
,
dms
:
DM_TIMELINE_URL
,
notifications
:
QVITTER_USER_NOTIFICATIONS_URL
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment