diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 4f35cf270..5eef2735f 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -1,13 +1,15 @@ import UserCardContent from '../user_card_content/user_card_content.vue' +import Timeline from '../timeline/timeline.vue' const UserProfile = { created () { this.$store.dispatch('startFetching', ['user', this.userId]) }, destroyed () { - this.$store.dispatch('stopFetching', ['user', this.userId]) + this.$store.dispatch('stopFetching', 'user') }, computed: { + timeline () { return this.$store.state.statuses.timelines.user }, userId () { return this.$route.params.id }, @@ -16,7 +18,8 @@ const UserProfile = { } }, components: { - UserCardContent + UserCardContent, + Timeline } } diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index fe693c9d9..0765b01c0 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -1,6 +1,9 @@ diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 3715a2118..026dae734 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -113,11 +113,11 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use let params = [] if (since) { - params.push('since_id', since) + params.push(['since_id', since]) } if (until) { - params.push('max_id', until) + params.push(['max_id', until]) } if (userId) {