diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2019-10-02 15:32:02 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 15:32:02 -0100 |
| commit | 17cc13d273fe92b70b7fb90d5eadbad4464c050d (patch) | |
| tree | fddd8f39fdca8eed627f9d964d96fe011bec98d8 /src | |
| parent | c0d71b7e096b31b16c7c3446bd32bd8e059b927a (diff) | |
| parent | d1f84b78e8de993c4424b7e8a13d07d1daf697fe (diff) | |
Merge pull request #777 from StCyr/bugfix/769/duplicate-results-on-new-mention
Remove old code that creates twin entries
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Composer.vue | 9 | ||||
| -rw-r--r-- | src/store/account.js | 14 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/components/Composer.vue b/src/components/Composer.vue index 1a4e680d..5f7ccd53 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -446,15 +446,6 @@ export default { cb(users) } this.remoteSearchAccounts(text).then((result) => { - if (result.data.result.exact) { - let user = result.data.result.exact - users.push({ - key: user.preferredUsername, - value: user.account, - url: user.url, - avatar: user.local ? OC.generateUrl(`/avatar/${user.preferredUsername}/32`) : ''// TODO: use real avatar from server - }) - } for (var i in result.data.result.accounts) { let user = result.data.result.accounts[i] users.push({ diff --git a/src/store/account.js b/src/store/account.js index e54d8c82..0c27f40e 100644 --- a/src/store/account.js +++ b/src/store/account.js @@ -45,11 +45,13 @@ const mutations = { let users = [] for (var index in data) { const actor = data[index].actor_info - users.push(actor.id) - addAccount(state, { - actorId: actor.id, - data: actor - }) + if (typeof actor !== 'undefined' && account !== actor.account) { + users.push(actor.id) + addAccount(state, { + actorId: actor.id, + data: actor + }) + } } Vue.set(state.accounts[_getActorIdForAccount(account)], 'followersList', users) }, @@ -57,7 +59,7 @@ const mutations = { let users = [] for (var index in data) { const actor = data[index].actor_info - if (typeof actor !== 'undefined') { + if (typeof actor !== 'undefined' && account !== actor.account) { users.push(actor.id) addAccount(state, { actorId: actor.id, |