Merge branch 'develop' into feat/media-modal

1 files changed, 20 insertions, 3 deletions

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index c9197a1c..991062cd 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -6,8 +6,10 @@ const UserProfile = {
   created () {
     this.$store.commit('clearTimeline', { timeline: 'user' })
     this.$store.commit('clearTimeline', { timeline: 'favorites' })
+    this.$store.commit('clearTimeline', { timeline: 'media' })
     this.$store.dispatch('startFetching', ['user', this.fetchBy])
-    this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+    this.$store.dispatch('startFetching', ['media', this.fetchBy])
+    this.startFetchFavorites()
     if (!this.user.id) {
       this.$store.dispatch('fetchUser', this.fetchBy)
     }
@@ -15,6 +17,7 @@ const UserProfile = {
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
     this.$store.dispatch('stopFetching', 'favorites')
+    this.$store.dispatch('stopFetching', 'media')
   },
   computed: {
     timeline () {
@@ -23,6 +26,9 @@ const UserProfile = {
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
+    media () {
+      return this.$store.state.statuses.timelines.media
+    },
     userId () {
       return this.$route.params.id || this.user.id
     },
@@ -68,6 +74,11 @@ const UserProfile = {
     fetchFriends () {
       const id = this.userId
       this.$store.dispatch('addFriends', { id })
+    },
+    startFetchFavorites () {
+      if (this.isUs) {
+        this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+      }
     }
   },
   watch: {
@@ -78,10 +89,13 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.dispatch('stopFetching', 'favorites')
+      this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.commit('clearTimeline', { timeline: 'favorites' })
+      this.$store.commit('clearTimeline', { timeline: 'media' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
-      this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+      this.$store.dispatch('startFetching', ['media', this.fetchBy])
+      this.startFetchFavorites()
     },
     userId () {
       if (!this.isExternal) {
@@ -89,10 +103,13 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.dispatch('stopFetching', 'favorites')
+      this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.commit('clearTimeline', { timeline: 'favorites' })
+      this.$store.commit('clearTimeline', { timeline: 'media' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
-      this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
+      this.$store.dispatch('startFetching', ['media', this.fetchBy])
+      this.startFetchFavorites()
     },
     user () {
       if (this.user.id && !this.user.followers) {