From 9362700137d7fb4b0cddf425d5a2de353f7ab242 Mon Sep 17 00:00:00 2001
From: Rachel H <rainyday@users.noreply.github.com>
Date: Thu, 13 Apr 2017 07:03:45 -0700
Subject: [PATCH] Convert emoji shortnames when sending status (#1666)
---
app/assets/javascripts/components/actions/compose.jsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
index 1b3cc60dcc..88e91c356f 100644
--- a/app/assets/javascripts/components/actions/compose.jsx
+++ b/app/assets/javascripts/components/actions/compose.jsx
@@ -2,6 +2,8 @@ import api from '../api';
import { updateTimeline } from './timelines';
+import * as emojione from 'emojione';
+
export const COMPOSE_CHANGE = 'COMPOSE_CHANGE';
export const COMPOSE_SUBMIT_REQUEST = 'COMPOSE_SUBMIT_REQUEST';
export const COMPOSE_SUBMIT_SUCCESS = 'COMPOSE_SUBMIT_SUCCESS';
@@ -72,9 +74,8 @@ export function mentionCompose(account, router) {
export function submitCompose() {
return function (dispatch, getState) {
dispatch(submitComposeRequest());
-
api(getState).post('/api/v1/statuses', {
- status: getState().getIn(['compose', 'text'], ''),
+ status: emojione.shortnameToUnicode(getState().getIn(['compose', 'text'], '')),
in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')),
sensitive: getState().getIn(['compose', 'sensitive']),
--
GitLab