Merge remote-tracking branch 'upstream/develop' into push_fix

* upstream/develop:
  Add a translation to the captcha strings in the registration form
  Small UI improvements for the CAPTCHA field
  Add encrypted captcha_answer_data for stateless captcha
  fixes many problems related to user profile

1 files changed, 9 insertions, 4 deletions

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index deee77dd..77bb1835 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -4,7 +4,6 @@ import Timeline from '../timeline/timeline.vue'
 
 const UserProfile = {
   created () {
-    debugger
     this.$store.commit('clearTimeline', { timeline: 'user' })
     this.$store.dispatch('startFetching', ['user', this.fetchBy])
     if (!this.user) {
@@ -19,18 +18,24 @@ const UserProfile = {
       return this.$store.state.statuses.timelines.user
     },
     userId () {
-      return this.$route.params.id
+      return this.$route.params.id || this.user.id
     },
     userName () {
       return this.$route.params.name
     },
+    friends () {
+      return this.user.friends
+    },
+    followers () {
+      return this.user.followers
+    },
     user () {
       if (this.timeline.statuses[0]) {
         return this.timeline.statuses[0].user
       } else {
         return Object.values(this.$store.state.users.usersObject).filter(user => {
           return (this.isExternal ? user.id === this.userId : user.screen_name === this.userName)
-        })[0] || false
+        })[0] || {}
       }
     },
     fetchBy () {
@@ -68,7 +73,7 @@ const UserProfile = {
       this.$store.dispatch('startFetching', ['user', this.userId])
     },
     user () {
-      if (!this.user.followers) {
+      if (this.user.id && !this.user.followers) {
         this.fetchFollowers()
         this.fetchFriends()
       }