From 9ff8bf4c143f849635d64f5d0344ff999908fe34 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 3 Nov 2016 17:17:32 +0100 Subject: [PATCH] Make mention strings work. --- .../post_status_form/post_status_form.js | 32 +++++++++++++++++-- src/components/status/status.vue | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 0944d841c2..0d4d87f289 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -1,12 +1,40 @@ import statusPoster from '../../services/status_poster/status_poster.service.js' +import { reject, map, uniqBy } from 'lodash'; + +const buildMentionsString = ({user, attentions}, currentUser) => { + + let allAttentions = [...attentions] + + allAttentions.unshift(user) + + allAttentions = uniqBy(allAttentions, 'id') + allAttentions = reject(allAttentions, {id: currentUser.id}) + + let mentions = map(allAttentions, (attention) => { + return `@${attention.screen_name}` + }) + + return mentions.join(' ') + ' ' +} const PostStatusForm = { props: [ - 'replyTo' + 'replyTo', + 'repliedUser', + 'attentions' ], data () { + let statusText = '' + + if (this.replyTo) { + const currentUser = this.$store.state.users.currentUser + statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser) + } + return { - newStatus: { } + newStatus: { + status: statusText + } } }, methods: { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index ab82732581..f3d36c5496 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -45,7 +45,7 @@ - +