Adds emojione as official package

.meteor/packages

@@ -17,7 +17,6 @@ markdown
 meteor-platform
 reactive-var
 service-configuration
-
 chrismbeckett:toastr
 francocatena:status
 iframely:oembed
@@ -39,7 +38,7 @@ pauli:accounts-linkedin
 percolate:migrations
 percolatestudio:synced-cron
 pierreeric:rxfavico
-qnub:emojione
+
 raix:handlebar-helpers
 rocketchat:file
 rocketchat:lib
@@ -49,6 +48,7 @@ rocketchat:highlight
 rocketchat:autolinker
 rocketchat:markdown
 rocketchat:emojione
+
 simple:highlight.js
 tap:i18n
 tmeasday:crypto-md5
@@ -56,3 +56,4 @@ tmeasday:errors
 todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
+emojione:emojione

.meteor/versions

@@ -22,6 +22,7 @@ ddp@1.1.0
 deps@1.0.7
 ejson@1.0.6
 email@1.0.6
+emojione:emojione@1.4.1
 facebook@1.2.0
 fastclick@1.0.3
 francocatena:status@1.2.3
@@ -84,7 +85,6 @@ pauli:linkedin@1.1.2
 percolate:migrations@0.7.5
 percolatestudio:synced-cron@1.1.0
 pierreeric:rxfavico@0.3.5_1
-qnub:emojione@0.0.3
 raix:handlebar-helpers@0.2.4
 random@1.0.3
 reactive-dict@1.1.0

client/methods/sendMessage.coffee

@@ -11,10 +11,7 @@ Meteor.methods
 				username: Meteor.user().username
 
 			message.html = message.msg
-
-			if _.trim(message.html) isnt ''
-				message.html = _.escapeHTML message.html
-
+			
 			message = RocketChat.callbacks.run 'beforeSaveMessage', message
 			message.html = message.html.replace /\n/g, '<br/>'
 			console.log message

client/startup/startup.coffee

@@ -31,10 +31,6 @@ Meteor.startup ->
 		$.getScript filename, (data) ->
 			moment.locale(userLanguage)
 
-	# Add ascii support to emojione
-	emojione?.ascii = true
-
-
 	Tracker.autorun ->
 		unreadCount = 0
 		subscriptions = ChatSubscription.find({}, { fields: { unread: 1 } })

client/views/app/chatMessageDashboard.html

@@ -42,7 +42,7 @@
 					</span>
 					{{/if}}
 					<div>
-						{{#emojione}}{{html}}{{/emojione}}
+						{{{html}}}
 					</div>
 				{{/if}}
 			{{/if}}

lib/emojione.ascii.coffee

@@ -0,0 +1,2 @@
+# Add ascii support to emojione
+emojione?.ascii = true

packages/rocketchat-emojione/emojione.coffee

@@ -10,4 +10,4 @@ class Emojione
 			
 		return message
 
-RocketChat.callbacks.add 'renderMessage', Emojione, RocketChat.callbacks.priority.LOW
+RocketChat.callbacks.add 'beforeSaveMessage', Emojione, RocketChat.callbacks.priority.LOW

packages/rocketchat-emojione/package.js

@@ -10,7 +10,7 @@ Package.onUse(function(api) {
 
 	api.use([
 		'coffeescript',
-		'qnub:emojione',
+		'emojione:emojione',
 		'rocketchat:lib@0.0.1'
 	]);
 

server/methods/sendMessage.coffee

@@ -8,7 +8,7 @@ Meteor.methods
 		if not room
 			return false
 
-		console.log '[methods] sendMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+		# console.log '[methods] sendMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
 		message.u = Meteor.users.findOne Meteor.userId(), fields: username: 1
 		message.ts = new Date()