diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/routes.js | 1 | ||||
| -rw-r--r-- | src/components/status/status.js | 6 | ||||
| -rw-r--r-- | src/components/user_card_content/user_card_content.js | 6 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.js | 30 | ||||
| -rw-r--r-- | src/services/user_profile_link_generator/user_profile_link_generator.js | 2 |
5 files changed, 33 insertions, 12 deletions
diff --git a/src/boot/routes.js b/src/boot/routes.js index 9a249ee5..2a08934f 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -29,6 +29,7 @@ export default (store) => { { name: 'tag-timeline', path: '/~/tag/:tag', component: TagTimeline }, { name: 'conversation', path: '/~/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'user-profile', path: '/:name', component: UserProfile }, + { name: 'external-user-profile', path: '/~/users/:id', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions }, { name: 'dms', path: '/:username/dms', component: DMs }, { name: 'settings', path: '/~/settings', component: Settings }, diff --git a/src/components/status/status.js b/src/components/status/status.js index fbf99a23..94d03ec2 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -204,9 +204,6 @@ const Status = { return 'small' } return 'normal' - }, - userProfileLink (id, name) { - return generateProfileLink(id, name) } }, components: { @@ -288,6 +285,9 @@ const Status = { }, replyLeave () { this.showPreview = false + }, + userProfileLink (id, name) { + return generateProfileLink(id, name) } }, watch: { diff --git a/src/components/user_card_content/user_card_content.js b/src/components/user_card_content/user_card_content.js index abdac58e..cdb1a850 100644 --- a/src/components/user_card_content/user_card_content.js +++ b/src/components/user_card_content/user_card_content.js @@ -41,9 +41,6 @@ export default { const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000)) return Math.round(this.user.statuses_count / days) }, - userProfileLink (user) { - return generateProfileLink(user.id, user.screen_name) - }, userHighlightType: { get () { const data = this.$store.state.config.highlight[this.user.screen_name] @@ -110,6 +107,9 @@ export default { if (target.tagName === 'A') { window.open(target.href, '_blank') } + }, + userProfileLink (user) { + return generateProfileLink(user.id, user.screen_name) } } } diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 8a32392a..95d797a2 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -3,19 +3,22 @@ import Timeline from '../timeline/timeline.vue' const UserProfile = { created () { + debugger this.$store.commit('clearTimeline', { timeline: 'user' }) - this.$store.dispatch('startFetching', ['user', this.userName]) + this.$store.dispatch('startFetching', ['user', this.fetchBy]) if (!this.user) { - this.$store.dispatch('fetchUser', this.userName) + this.$store.dispatch('fetchUser', this.fetchBy) } }, destroyed () { this.$store.dispatch('stopFetching', 'user') }, computed: { - timeline () { return this.$store.state.statuses.timelines.user }, + timeline () { + return this.$store.state.statuses.timelines.user + }, userId () { - return this.user.id + return this.$route.params.id }, userName () { return this.$route.params.name @@ -25,16 +28,33 @@ const UserProfile = { return this.timeline.statuses[0].user } else { return Object.values(this.$store.state.users.usersObject).filter(user => { - return user.screen_name === this.userName + return (this.isExternal ? user.id === this.userId : user.screen_name === this.userName) })[0] || false } + }, + fetchBy () { + return this.isExternal ? this.userId : this.userName + }, + isExternal () { + return this.$route.name === 'external-user-profile' } }, watch: { userName () { + if (this.isExternal) { + return + } this.$store.dispatch('stopFetching', 'user') this.$store.commit('clearTimeline', { timeline: 'user' }) this.$store.dispatch('startFetching', ['user', this.userName]) + }, + userId () { + if (!this.isExternal) { + return + } + this.$store.dispatch('stopFetching', 'user') + this.$store.commit('clearTimeline', { timeline: 'user' }) + this.$store.dispatch('startFetching', ['user', this.userId]) } }, components: { diff --git a/src/services/user_profile_link_generator/user_profile_link_generator.js b/src/services/user_profile_link_generator/user_profile_link_generator.js index 9ae15792..3367eb8a 100644 --- a/src/services/user_profile_link_generator/user_profile_link_generator.js +++ b/src/services/user_profile_link_generator/user_profile_link_generator.js @@ -1,6 +1,6 @@ const generateProfileLink = (id, screenName) => { return { - name: 'user-profile', + name: (isExternal(screenName) ? 'external-user-profile' : 'user-profile'), params: (isExternal(screenName) ? { id } : { name: screenName }) } } |