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] 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"/>