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

Merge branch 'develop' into feat/media-modal

Browse source
This commit is contained in:
shpuld 2019-01-28 19:02:46 +02:00
commit 51024a2c8a
16 changed files with 501 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,6 +325,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
notifications: QVITTER_USER_NOTIFICATIONS_URL,
'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
user: QVITTER_USER_TIMELINE_URL,
media: QVITTER_USER_TIMELINE_URL,
favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
tag: TAG_TIMELINE_URL
}
@ -345,6 +346,9 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
if (tag) {
url += `/${tag}.json`
}
if (timeline === 'media') {
params.push(['only_media', 1])
}
params.push(['count', 20])

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

@ -102,6 +102,10 @@ export const parseUser = (data) => {
output.default_scope = data.default_scope
output.hide_network = data.hide_network
output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship"
output.following = data.following
// Websocket token
output.token = data.token
}
output.created_at = new Date(data.created_at)