forked from AkkomaGang/akkoma-fe
fixes many problems related to user profile
This commit is contained in:
parent
b65ac128c1
commit
b7962a224c
2 changed files with 10 additions and 5 deletions
|
@ -4,7 +4,6 @@ import Timeline from '../timeline/timeline.vue'
|
||||||
|
|
||||||
const UserProfile = {
|
const UserProfile = {
|
||||||
created () {
|
created () {
|
||||||
debugger
|
|
||||||
this.$store.commit('clearTimeline', { timeline: 'user' })
|
this.$store.commit('clearTimeline', { timeline: 'user' })
|
||||||
this.$store.dispatch('startFetching', ['user', this.fetchBy])
|
this.$store.dispatch('startFetching', ['user', this.fetchBy])
|
||||||
if (!this.user) {
|
if (!this.user) {
|
||||||
|
@ -19,18 +18,24 @@ const UserProfile = {
|
||||||
return this.$store.state.statuses.timelines.user
|
return this.$store.state.statuses.timelines.user
|
||||||
},
|
},
|
||||||
userId () {
|
userId () {
|
||||||
return this.$route.params.id
|
return this.$route.params.id || this.user.id
|
||||||
},
|
},
|
||||||
userName () {
|
userName () {
|
||||||
return this.$route.params.name
|
return this.$route.params.name
|
||||||
},
|
},
|
||||||
|
friends () {
|
||||||
|
return this.user.friends
|
||||||
|
},
|
||||||
|
followers () {
|
||||||
|
return this.user.followers
|
||||||
|
},
|
||||||
user () {
|
user () {
|
||||||
if (this.timeline.statuses[0]) {
|
if (this.timeline.statuses[0]) {
|
||||||
return this.timeline.statuses[0].user
|
return this.timeline.statuses[0].user
|
||||||
} else {
|
} else {
|
||||||
return Object.values(this.$store.state.users.usersObject).filter(user => {
|
return Object.values(this.$store.state.users.usersObject).filter(user => {
|
||||||
return (this.isExternal ? user.id === this.userId : user.screen_name === this.userName)
|
return (this.isExternal ? user.id === this.userId : user.screen_name === this.userName)
|
||||||
})[0] || false
|
})[0] || {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fetchBy () {
|
fetchBy () {
|
||||||
|
@ -68,7 +73,7 @@ const UserProfile = {
|
||||||
this.$store.dispatch('startFetching', ['user', this.userId])
|
this.$store.dispatch('startFetching', ['user', this.userId])
|
||||||
},
|
},
|
||||||
user () {
|
user () {
|
||||||
if (!this.user.followers) {
|
if (this.user.id && !this.user.followers) {
|
||||||
this.fetchFollowers()
|
this.fetchFollowers()
|
||||||
this.fetchFriends()
|
this.fetchFriends()
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<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>
|
<user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
|
||||||
<tab-switcher>
|
<tab-switcher>
|
||||||
<Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
|
<Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
|
||||||
|
|
Loading…
Reference in a new issue