From b7962a224c55a20aaa411f01452879aec824cf93 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 20 Dec 2018 07:54:55 +0300
Subject: [PATCH 1/4] fixes many problems related to user profile

---
 src/components/user_profile/user_profile.js  | 13 +++++++++----
 src/components/user_profile/user_profile.vue |  2 +-
 2 files changed, 10 insertions(+), 5 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()
       }
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 5c823b3d..84fdba45 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-  <div v-if="user" class="user-profile panel panel-default">
+  <div v-if="user.id" class="user-profile panel panel-default">
     <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
     <tab-switcher>
       <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>

From 8470856045d2eef0ced9115bfe994a280c88c919 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Fri, 21 Dec 2018 00:25:09 +0300
Subject: [PATCH 2/4] Add encrypted captcha_answer_data for stateless captcha

---
 src/components/registration/registration.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 65b2fb9b..dd8e6e5d 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -48,8 +48,10 @@ const registration = {
     async submit () {
       this.user.nickname = this.user.username
       this.user.token = this.token
+
       this.user.captcha_solution = this.captcha.solution
       this.user.captcha_token = this.captcha.token
+      this.user.captcha_answer_data = this.captcha.answer_data
 
       this.$v.$touch()
 

From 661efc51b79012c48cfb63748e0adb4b71f4517b Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Fri, 21 Dec 2018 00:25:36 +0300
Subject: [PATCH 3/4] Small UI improvements for the CAPTCHA field

---
 src/components/registration/registration.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index f187e215..785d691a 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -76,15 +76,16 @@
             </div>
 
             <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
+              <label class='form--label' for='captcha-label'>CAPTCHA</label>
+
               <template v-if="captcha.type == 'kocaptcha'">
                 <img v-bind:src="captcha.url" v-on:click="setCaptcha">
 
                 <sub>Click the image to get a new captcha</sub>
-                <label class='form--label' for='captcha-label'>CAPTCHA</label>
 
                 <input :disabled="isPending"
                   v-model='captcha.solution'
-                  class='form-control' id='captcha-answer' type='text'>
+                  class='form-control' id='captcha-answer' type='text' autocomplete="off">
               </template>
             </div>
 

From 10642df528ab0119055224e289f39ecd48e49dbd Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Fri, 21 Dec 2018 09:53:04 +0300
Subject: [PATCH 4/4] Add a translation to the captcha strings in the
 registration form

---
 src/components/registration/registration.vue | 4 ++--
 src/i18n/en.json                             | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 785d691a..1455354e 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -76,12 +76,12 @@
             </div>
 
             <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
-              <label class='form--label' for='captcha-label'>CAPTCHA</label>
+              <label class='form--label' for='captcha-label'>$t('captcha')</label>
 
               <template v-if="captcha.type == 'kocaptcha'">
                 <img v-bind:src="captcha.url" v-on:click="setCaptcha">
 
-                <sub>Click the image to get a new captcha</sub>
+                <sub>{{$t('registration.new_captcha')}}</sub>
 
                 <input :disabled="isPending"
                   v-model='captcha.solution'
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f445bfc2..3662c6f6 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -74,6 +74,8 @@
     "password_confirm": "Password confirmation",
     "registration": "Registration",
     "token": "Invite token",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Click the image to get a new captcha",
     "validations": {
       "username_required": "cannot be left blank",
       "fullname_required": "cannot be left blank",