From 5a97cfb9599fb33b15f878869b940444234e3534 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Wed, 28 Mar 2018 17:45:35 +0900 Subject: [PATCH] who-to-follow-panel using internal user link --- .../who_to_follow_panel.js | 34 ++++++++----------- .../who_to_follow_panel.vue | 6 ++-- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js index 2d376ef9..43cd3e2d 100644 --- a/src/components/who_to_follow_panel/who_to_follow_panel.js +++ b/src/components/who_to_follow_panel/who_to_follow_panel.js @@ -19,44 +19,40 @@ function showWhoToFollow (panel, users, aHost, aUser) { } else { img = '/images/avi.png' } - var link = 'https://' + host + '/users/' + username var name = username + '@' + host if ((!user.following) && (!user.blacklisted) && (!(host === aHost && username === aUser))) { if (index === 0) { panel.img1 = img - panel.link1 = link panel.name1 = name - this.$store.state.api.backendInteractor.externalProfile(name) + panel.$store.state.api.backendInteractor.externalProfile(name) .then((externalUser) => { if (!externalUser.error) { - this.$store.commit('addNewUsers', [externalUser]) - panel.link1 = 'https://' + host + '/users/' + externalUser.id - } - }) + panel.$store.commit('addNewUsers', [externalUser]) + panel.link1 = '/users/' + externalUser.id + } + }) } else if (index === 1) { panel.img2 = img - panel.link2 = link panel.name2 = name - this.$store.state.api.backendInteractor.externalProfile(name) + panel.$store.state.api.backendInteractor.externalProfile(name) .then((externalUser) => { if (!externalUser.error) { - this.$store.commit('addNewUsers', [externalUser]) - panel.link2 = 'https://' + host + '/users/' + externalUser.id - } - }) + panel.$store.commit('addNewUsers', [externalUser]) + panel.link2 = '/users/' + externalUser.id + } + }) } else if (index === 2) { panel.img3 = img - panel.link3 = link panel.name3 = name - this.$store.state.api.backendInteractor.externalProfile(name) + panel.$store.state.api.backendInteractor.externalProfile(name) .then((externalUser) => { if (!externalUser.error) { - this.$store.commit('addNewUsers', [externalUser]) - panel.link3 = 'https://' + host + '/users/' + externalUser.id - } - }) + panel.$store.commit('addNewUsers', [externalUser]) + panel.link3 = '/users/' + externalUser.id + } + }) } index = index + 1 if (index > 2) { diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue index fff966ab..56adbf41 100644 --- a/src/components/who_to_follow_panel/who_to_follow_panel.vue +++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue @@ -8,9 +8,9 @@

- {{ name1 }}
- {{ name2 }}
- {{ name3 }}
+ {{ name1 }}
+ {{ name2 }}
+ {{ name3 }}
More