From 963f1679e0b24b36c77f15bb7c8e832583f93d79 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 8 Jun 2021 17:04:57 +0300 Subject: fix console errors --- src/components/mention_link/mention_link.js | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/components/mention_link') diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js index 8ad84a51..acd0f584 100644 --- a/src/components/mention_link/mention_link.js +++ b/src/components/mention_link/mention_link.js @@ -6,13 +6,20 @@ const MentionLink = { name: 'MentionLink', props: { url: { - required: true, type: String }, content: { required: true, type: String }, + userId: { + required: false, + type: String + }, + userScreenName: { + required: false, + type: String + }, firstMention: { required: false, type: Boolean, @@ -21,29 +28,32 @@ const MentionLink = { }, methods: { onClick () { - const link = generateProfileLink(this.user.id, this.user.screen_name) + const link = generateProfileLink( + this.userId || this.user.id, + this.userScreenName || this.user.screen_name + ) this.$router.push(link) } }, computed: { user () { - return this.$store.getters.findUserByUrl(this.url) + return this.url && this.$store.getters.findUserByUrl(this.url) }, isYou () { // FIXME why user !== currentUser??? - return this.user.screen_name === this.currentUser.screen_name + return this.user && this.user.screen_name === this.currentUser.screen_name }, userName () { - return this.userNameFullUi.split('@')[0] + return this.user && this.userNameFullUi.split('@')[0] }, userNameFull () { - return this.user.screen_name + return this.user && this.user.screen_name }, userNameFullUi () { - return this.user.screen_name_ui + return this.user && this.user.screen_name_ui }, highlight () { - return this.mergedConfig.highlight[this.user.screen_name] + return this.user && this.mergedConfig.highlight[this.user.screen_name] }, highlightType () { return this.highlight && ('-' + this.highlight.type) -- cgit v1.2.3-70-g09d2