better readability: merge consecutive messages

For #12

Author: feross

lib/rich-message.js

@@ -1,4 +1,5 @@
 module.exports = makeRichMessage
+module.exports.mergeMessages = mergeMessages
 
 var autolinker = require('autolinker')
 var emojiNamedCharacters = require('emoji-named-characters')
@@ -16,26 +17,33 @@ var convertHTML = htmlToVDom({
   VText: VText
 })
 
+function makeVDom (html) {
+  return convertHTML('<div>' + html + '</div>')
+}
+
 function makeRichMessage (message) {
   message.anon = /Anonymous/i.test(message.username)
   message.avatar = message.anon
     ? 'static/Icon.png'
     : 'https://github.com/' + message.username + '.png'
   message.timeago = util.timeago(message.timestamp)
-  message.rawText = message.text
-  message.text = escapeHTML(message.text)
 
-  message.text = message.text.replace(EMOJI_REGEX, function (full, $1, $2, $3) {
-    return ($1 || '') + renderEmoji($2) + ($3 || '')
-  })
+  message.html = escapeHTML(message.text)
+  message.html = emojify(message.html)
+  message.html = autolinker.link(message.html)
+  message.html = ghlink(message.html, { format: 'html' })
 
-  var messageHtml = autolinker.link(message.text)
-  messageHtml = ghlink(messageHtml, {format: 'html'})
-  message.text = convertHTML('<span>' + messageHtml + '</span>')
+  message.vdom = makeVDom(message.html)
 
   return message
 }
 
+function emojify (str) {
+  return str.replace(EMOJI_REGEX, function (full, $1, $2, $3) {
+    return ($1 || '') + renderEmoji($2) + ($3 || '')
+  })
+}
+
 function renderEmoji (emoji) {
   return emoji in emojiNamedCharacters ?
       '<img src="node_modules/emoji-named-characters/pngs/' + encodeURI(emoji) + '.png"'
@@ -44,3 +52,10 @@ function renderEmoji (emoji) {
       + ' class="emoji" align="absmiddle" height="20" width="20">'
     : ':' + emoji + ':'
 }
+
+function mergeMessages (message1, message2) {
+  message1.text += '\n' + message2.text
+  message1.html += '<p></p>' + message2.html
+  message1.vdom = makeVDom(message1.html)
+  return message1
+}