therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"

Browse source 
and some stuff to make favorites still work

This reverts commit 039a407400.
This commit is contained in:
Henry Jameson 2019-01-17 21:46:03 +03:00
parent 0f8baff5a3
commit cab87744c8
6 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/api/api.service.js
View file

@ -327,11 +327,10 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
tag: TAG_TIMELINE_URL
}
const type = timeline.type || timeline
const isNotifications = type === 'notifications'
const isNotifications = timeline === 'notifications'
const params = []
let url = timelineUrls[type]
let url = timelineUrls[timeline]
if (since) {
params.push(['since_id', since])

4
src/services/timeline_fetcher/timeline_fetcher.service.js
View file

@ -3,7 +3,7 @@ import { camelCase } from 'lodash'
import apiService from '../api/api.service.js'
const update = ({store, statuses, timeline, showImmediately, userId}) => {
const ccTimeline = typeof timeline === 'object' ? timeline : camelCase(timeline)
const ccTimeline = camelCase(timeline)
store.dispatch('setError', { value: false })
@ -18,7 +18,7 @@ const update = ({store, statuses, timeline, showImmediately, userId}) => {
const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until}) => {
const args = { timeline, credentials }
const rootState = store.rootState || store.state
const timelineData = typeof timeline === 'object' ? timeline : rootState.statuses.timelines[camelCase(timeline)]
const timelineData = rootState.statuses.timelines[camelCase(timeline)]
if (older) {
args['until'] = until || timelineData.minVisibleId