Align title correctly when first character is emoji

server/models/Document.js

@@ -8,6 +8,7 @@ import isUUID from 'validator/lib/isUUID';
 import { DataTypes, sequelize } from '../sequelize';
 import { convertToMarkdown } from '../../frontend/utils/markdown';
 import { truncateMarkdown } from '../utils/truncate';
+import parseTitle from '../../shared/parseTitle';
 import Revision from './Revision';
 
 const URL_REGEX = /^[a-zA-Z0-9-]*-([a-zA-Z0-9]{10,15})$/;
@@ -35,15 +36,10 @@ const createUrlId = doc => {
   return (doc.urlId = doc.urlId || randomstring.generate(10));
 };
 
-const extractEmoji = doc => {
-  const regex = emojiRegex();
-  const match = regex.exec(doc.title);
-
-  if (match.length) return match[0];
-  return null;
-};
-
 const beforeSave = async doc => {
+  const { emoji } = parseTitle(doc.text);
+
+  doc.emoji = emoji;
   doc.html = convertToMarkdown(doc.text);
   doc.preview = truncateMarkdown(doc.text, 160);
   doc.revisionCount += 1;
@@ -62,7 +58,6 @@ const beforeSave = async doc => {
   // We'll add the current user as revision hasn't been generated yet
   ids.push(doc.lastModifiedById);
   doc.collaboratorIds = _.uniq(ids);
-  doc.emoji = extractEmoji(doc);
 
   return doc;
 };