From c811244c6424dedd15ad0ef2d2cfd4752f374ff6 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 18:28:40 -0300
Subject: [PATCH 01/33] Create method to load url and extract headers and meta
 tags

---
 packages/rocketchat-oembed/package.js    |  1 +
 packages/rocketchat-oembed/server.coffee | 82 ++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 packages/rocketchat-oembed/server.coffee

diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index 1c3cbaf36269..ada2123d07b5 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 	]);
 
 	api.addFiles('oembed.coffee', ['server','client']);
+	api.addFiles('server.coffee', ['server']);
 });
 
 Package.onTest(function(api) {
diff --git a/packages/rocketchat-oembed/server.coffee b/packages/rocketchat-oembed/server.coffee
new file mode 100644
index 000000000000..253b95d194c5
--- /dev/null
+++ b/packages/rocketchat-oembed/server.coffee
@@ -0,0 +1,82 @@
+URL = Npm.require('url')
+http = Npm.require('http')
+https = Npm.require('https')
+querystring = Npm.require('querystring')
+
+getUrlContent = (urlObj, redirectCount = 5, callback) ->
+	opts =
+		method: 'GET'
+		port: urlObj.port
+		hostname: urlObj.hostname
+		path: urlObj.path
+
+	httpOrHttps = if urlObj.protocol is 'https:' then https else http
+
+	request = httpOrHttps.request opts, (response) ->
+		if response.statusCode is 301 and response.headers.location?
+			request.abort()
+			console.log response.headers.location
+
+			if redirectCount <= 0
+				return callback null, null
+
+			getUrlContent response.headers.location, --redirectCount, callback
+			return
+
+		if response.statusCode isnt 200
+			return callback null, null
+
+		str = ''
+		response.on 'data', (chunk) ->
+			str += chunk
+			if str.length > 250000
+				request.abort()
+
+		response.on 'end', ->
+			callback null, {
+				headers: response.headers
+				body: str
+			}
+
+	request.end()
+
+getUrlMeta = (url, withFragment) ->
+	getUrlContentSync = Meteor.wrapAsync getUrlContent
+
+	urlObj = URL.parse url
+
+	if withFragment?
+		queryStringObj = querystring.parse urlObj.query
+		queryStringObj._escaped_fragment_ = ''
+		urlObj.query = querystring.stringify queryStringObj
+
+		path = urlObj.pathname
+		if urlObj.query?
+			path += '?' + urlObj.query
+
+		urlObj.path = path
+
+	content = getUrlContentSync urlObj, 5
+
+	metas = {}
+
+	content?.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
+		metas[name] = value
+
+	return {
+		meta: metas
+		headers: content?.headers
+	}
+
+
+Meteor.methods
+	getUrlMeta: (url) ->
+		data = getUrlMeta url
+
+		if data.meta.fragment is '!'
+			data = getUrlMeta url, true
+
+		console.log data.meta
+		console.log data.headers
+
+		return data
\ No newline at end of file

From 545698f6078bc2f3ab29267ad49df5b740e0e438 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 19:51:53 -0300
Subject: [PATCH 02/33] Process message and update url with more info

---
 client/lib/collections.coffee            |  5 +-
 packages/rocketchat-oembed/package.js    |  2 +-
 packages/rocketchat-oembed/server.coffee | 63 ++++++++++++++++++++----
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee
index 1b5c116c1a2e..1b7196da9e85 100644
--- a/client/lib/collections.coffee
+++ b/client/lib/collections.coffee
@@ -12,4 +12,7 @@ Meteor.startup ->
 				ChatMessageHistory.insert record
 
 		changed: (record) ->
-			ChatMessageHistory.update {_id: record._id, msg: {$ne: record.msg}}, record
+			_id = record._id
+			delete record._id
+
+			ChatMessageHistory.update { _id: _id }, { $set: record }
diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index ada2123d07b5..ce5fa7329852 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -14,8 +14,8 @@ Package.onUse(function(api) {
 		'rocketchat:lib@0.0.1'
 	]);
 
-	api.addFiles('oembed.coffee', ['server','client']);
 	api.addFiles('server.coffee', ['server']);
+	api.export('OEmbed', ['server']);
 });
 
 Package.onTest(function(api) {
diff --git a/packages/rocketchat-oembed/server.coffee b/packages/rocketchat-oembed/server.coffee
index 253b95d194c5..ae794fc37d27 100644
--- a/packages/rocketchat-oembed/server.coffee
+++ b/packages/rocketchat-oembed/server.coffee
@@ -3,7 +3,12 @@ http = Npm.require('http')
 https = Npm.require('https')
 querystring = Npm.require('querystring')
 
+OEmbed = {}
+
 getUrlContent = (urlObj, redirectCount = 5, callback) ->
+	if _.isString(urlObj)
+		urlObj = URL.parse urlObj
+
 	opts =
 		method: 'GET'
 		port: urlObj.port
@@ -36,11 +41,12 @@ getUrlContent = (urlObj, redirectCount = 5, callback) ->
 			callback null, {
 				headers: response.headers
 				body: str
+				parsedUrl: _.pick urlObj, ['host', 'hash', 'pathname', 'protocol', 'port', 'query']
 			}
 
 	request.end()
 
-getUrlMeta = (url, withFragment) ->
+OEmbed.getUrlMeta = (url, withFragment) ->
 	getUrlContentSync = Meteor.wrapAsync getUrlContent
 
 	urlObj = URL.parse url
@@ -63,20 +69,59 @@ getUrlMeta = (url, withFragment) ->
 	content?.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
 		metas[name] = value
 
+	if metas.fragment is '!' and not withFragment?
+		return OEmbed.getUrlMeta url, true
+
 	return {
 		meta: metas
 		headers: content?.headers
+		parsedUrl: content.parsedUrl
 	}
 
+getRelevantHeaders = (headersObj) ->
+	headers = {}
+	for key, value of headersObj
+		key = key.toLowerCase()
+		if key in ['content-type', 'content-length'] and value?.trim() isnt ''
+			headers[key.replace(/\./g, '-')] = value
+
+	if Object.keys(headers).length > 0
+		return headers
+	return
+
+getRelevantMetaTags = (metaObj) ->
+	tags = {}
+	for key, value of metaObj
+		key = key.toLowerCase()
+		if /^(og|fb|twitter):.+|description$/.test(key) and value?.trim() isnt ''
+			tags[key.replace(/\./g, '-')] = value
+
+	if Object.keys(tags).length > 0
+		return tags
+	return
+
+RocketUrlParser = (message) ->
+	if Array.isArray message.urls
+		for item in message.urls
+			data = OEmbed.getUrlMeta item.url
+
+			if data?.meta?
+				item.meta = getRelevantMetaTags data.meta
+
+			if data?.headers?
+				item.headers = getRelevantHeaders data.headers
+
+			item.parsedUrl = data.parsedUrl
+
+		ChatMessage.update {_id: message._id}, { $set: { urls: message.urls } }
 
-Meteor.methods
-	getUrlMeta: (url) ->
-		data = getUrlMeta url
+RocketChat.callbacks.add 'afterSaveMessage', RocketUrlParser, RocketChat.callbacks.priority.LOW
 
-		if data.meta.fragment is '!'
-			data = getUrlMeta url, true
+# Meteor.methods
+# 	getUrlMeta: (url) ->
+# 		data = OEmbed.getUrlMeta url
 
-		console.log data.meta
-		console.log data.headers
+# 		console.log data.meta
+# 		console.log data.headers
 
-		return data
\ No newline at end of file
+# 		return data
\ No newline at end of file

From e85f46236d075bd1ea95664ee222d5a4fc6e5fcf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 19:52:23 -0300
Subject: [PATCH 03/33] Change urls of messages from Array of String to Array
 of Objects

---
 server/methods/sendMessage.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 74de6bb8eddd..0def48e734e4 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -15,7 +15,7 @@ Meteor.methods
 		message.u = Meteor.users.findOne Meteor.userId(), fields: username: 1
 
 		if urls = message.msg.match /([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]+)?\??([-\+=&!:;%@\/\.\,\w]+)?#?([\w]+)?)?/g
-			message.urls = urls
+			message.urls = urls.map (url) -> url: url
 
 		message = RocketChat.callbacks.run 'beforeSaveMessage', message
 

From 12aff6327ecc77bb019b0d8208413cf6cb914644 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 19:52:52 -0300
Subject: [PATCH 04/33] Change sendMessage to user insert and delete instead
 upsert to pass correct _id to aferSaveMessage

---
 server/methods/sendMessage.coffee | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 0def48e734e4..2e3f304c4a0c 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -107,19 +107,15 @@ Meteor.methods
 		###
 		Save the message. If there was already a typing record, update it.
 		###
-		ChatMessage.upsert
-			rid: message.rid
-			t: 't'
-			$and: [{ 'u._id': message.u._id }]
-		,
-			$set: message
-			$unset:
-				t: 1
-				expireAt: 1
+		message._id = ChatMessage.insert message
 
 		Meteor.defer ->
+			ChatMessage.remove
+				rid: message.rid
+				t: 't'
+				'u._id': message.u._id
 
-			message._id = Random.id()
+		Meteor.defer ->
 			RocketChat.callbacks.run 'afterSaveMessage', message
 
 

From bac59beeffccc1655a1344b339af44ff45f54662 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 21:10:32 -0300
Subject: [PATCH 05/33] Remove iframely

---
 .meteor/versions                         |  1 -
 packages/rocketchat-oembed/oembed.coffee | 41 ------------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 packages/rocketchat-oembed/oembed.coffee

diff --git a/.meteor/versions b/.meteor/versions
index 9da48a853e8b..a5bbd3186447 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -32,7 +32,6 @@ html-tools@1.0.4
 htmljs@1.0.4
 http@1.1.0
 id-map@1.0.3
-iframely:oembed@0.0.2
 iron:controller@1.0.8
 iron:core@1.0.8
 iron:dynamic-template@1.0.8
diff --git a/packages/rocketchat-oembed/oembed.coffee b/packages/rocketchat-oembed/oembed.coffee
deleted file mode 100644
index 010fbeb94ffc..000000000000
--- a/packages/rocketchat-oembed/oembed.coffee
+++ /dev/null
@@ -1,41 +0,0 @@
-###
-# OEmbed is a temporary image and map embedder for bots development
-# @param {Object} msg - The message object
-# to be replaced by proper implementation in 1.0
-###
-
-# IframelyOembed.setEndpoint 'http://open.iframe.ly/api/oembed?api_key=' + Meteor.settings.public?.iframelyApiKey?
-IframelyOembed.setCacheOptions
-	cacheTTL: 1000 * 60 * 60, # Hour.
-	cacheErrorTTL: 1000 * 60, # Minute.
-	cacheEnabled: true
-
-class OEmbed
-	constructor: (message) ->
-		console.log "OEmbed constructor" if window.rocketDebug
-
-		message.urls?.forEach (url) ->
-			console.log "OEmbed iframely.oembed", url if window.rocketDebug
-			Meteor.call 'iframely.oembed', url, (error, data) =>
-				console.log "OEmbed iframely.oembed callback", error, data if window.rocketDebug
-				if _.trim data.html
-					message.html = message.html + data.html
-
-		# if _.trim message.msg
-
-		# 	picmatch = message.msg.match(/^https?:\/\/(?:[a-z0-9\-]+\.)+[a-z0-9]{2,6}(?:\/[^\/#?]+)+\.(?:jpe?g|gif|png)$/i)
-		# 	if picmatch?
-		# 		# inline style to limit code pollution
-		# 		console.log "OEmbed picmatch" if window.rocketDebug
-		# 		message.html = "<img style='width:400px;height:auto;' src='" + message.msg + "'></img>"
-
-		# 	else
-		# 		mapmatch = message.msg.match(/^https?\:\/\/maps\.(google|googleapis)\.[a-z]+\/maps\/api.*format=png$/i)
-		# 		if mapmatch?
-		# 			console.log "OEmbed mapmatch" if window.rocketDebug
-		# 			message.html = "<img style='width:400px;height:auto;' src='" + message.msg + "'></img>"
-
-		return message
-
-
-# RocketChat.callbacks.add 'renderMessage', OEmbed, RocketChat.callbacks.priority.HIGH

From a93968e0b2af95eead6b13a75cc2a3e613a31b00 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 21:11:04 -0300
Subject: [PATCH 06/33] Move oembed server file

---
 packages/rocketchat-oembed/{ => server}/server.coffee | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/rocketchat-oembed/{ => server}/server.coffee (100%)

diff --git a/packages/rocketchat-oembed/server.coffee b/packages/rocketchat-oembed/server/server.coffee
similarity index 100%
rename from packages/rocketchat-oembed/server.coffee
rename to packages/rocketchat-oembed/server/server.coffee

From d9b937f2fc780ae04f4c9bc0e4d45a20b0321ca5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 21:11:47 -0300
Subject: [PATCH 07/33] Implement oembed renders and improve quotes

---
 client/stylesheets/base.less                   |  7 ++++---
 client/views/app/message.coffee                | 12 +++++-------
 packages/rocketchat-markdown/markdown.coffee   |  3 ++-
 .../rocketchat-oembed/client/baseWidget.coffee | 10 ++++++++++
 .../rocketchat-oembed/client/baseWidget.html   |  3 +++
 .../client/oembedImageWidget.html              |  9 +++++++++
 .../client/oembedUrlWidget.coffee              |  7 +++++++
 .../client/oembedUrlWidget.html                | 11 +++++++++++
 .../client/oembedYoutubeWidget.coffee          |  3 +++
 .../client/oembedYoutubeWidget.html            |  9 +++++++++
 packages/rocketchat-oembed/package.js          | 18 +++++++++++++++---
 11 files changed, 78 insertions(+), 14 deletions(-)
 create mode 100644 packages/rocketchat-oembed/client/baseWidget.coffee
 create mode 100644 packages/rocketchat-oembed/client/baseWidget.html
 create mode 100644 packages/rocketchat-oembed/client/oembedImageWidget.html
 create mode 100644 packages/rocketchat-oembed/client/oembedUrlWidget.coffee
 create mode 100644 packages/rocketchat-oembed/client/oembedUrlWidget.html
 create mode 100644 packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee
 create mode 100644 packages/rocketchat-oembed/client/oembedYoutubeWidget.html

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index fe290e2c6ec6..cb855fc0606b 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -66,15 +66,16 @@ pre {
 	width: 100%;
 }
 
-q {
+blockquote {
 	padding-left: 10px;
+	position: relative;
 	&:before {
 		content: ' ';
 		background-color: #ccc;
-		height: 22px;
+		height: 100%;
 		width: 3px;
 		position: absolute;
-		left: 50px;
+		left: 0px;
 	}
 }
 
diff --git a/client/views/app/message.coffee b/client/views/app/message.coffee
index 1f9ccc26c13a..cc380773772c 100644
--- a/client/views/app/message.coffee
+++ b/client/views/app/message.coffee
@@ -54,13 +54,11 @@ Template.message.onViewRendered = (context) ->
 		wrapper = ul.parentElement
 
 		if context.urls?.length > 0
-			for url in context.urls
-				do (url) ->
-					Meteor.call 'iframely.oembed', url, (error, data) ->
-						height = lastNode.clientHeight
-
-						urlNode = lastNode.querySelector('.body a[href="'+url+'"]')
-						urlNode?.innerHTML = Blaze.toHTMLWithData Template.iframelyBaseWidget, data
+			for item in context.urls
+				do (item) ->
+					urlNode = lastNode.querySelector('.body a[href="'+item.url+'"]')
+					if urlNode?
+						$(urlNode).replaceWith Blaze.toHTMLWithData Template.oembedBaseWidget, item
 
 		if not lastNode.nextElementSibling?
 			if lastNode.classList.contains('own') is true
diff --git a/packages/rocketchat-markdown/markdown.coffee b/packages/rocketchat-markdown/markdown.coffee
index 5694fd2ab2de..76ae02cb0f72 100644
--- a/packages/rocketchat-markdown/markdown.coffee
+++ b/packages/rocketchat-markdown/markdown.coffee
@@ -15,7 +15,8 @@ class Markdown
 			msg = msg.replace(/(\ |^)\_([^_]+)\_(\ |$)/gm, '$1<span class="copyonly">_</span><em>$2</em><span class="copyonly">_</span>$3')
 			msg = msg.replace(/(\ |^)\`([^`]+)\`(\ |$)/gm, '$1<span class="copyonly">`</span><code class="inline">$2</code><span class="copyonly">`</span>$3')
 			msg = msg.replace(/(\ |^)\~{1,2}([^~]+)\~{1,2}(\ |$)/gm, '$1<span class="copyonly">~</span><strike>$2</strike><span class="copyonly">~</span>$3')
-			msg = msg.replace(/^&gt;(.*)$/gm, '<q><span class="copyonly">&gt;</span>$1</q>')
+			msg = msg.replace(/^&gt;(.*)$/gm, '<blockquote><span class="copyonly">&gt;</span>$1</blockquote>')
+			msg = msg.replace(/<\/blockquote>\n<blockquote>/gm, '</blockquote><blockquote>')
 
 			message.html = msg
 
diff --git a/packages/rocketchat-oembed/client/baseWidget.coffee b/packages/rocketchat-oembed/client/baseWidget.coffee
new file mode 100644
index 000000000000..eaceb2244fc4
--- /dev/null
+++ b/packages/rocketchat-oembed/client/baseWidget.coffee
@@ -0,0 +1,10 @@
+Template.oembedBaseWidget.helpers
+	template: ->
+		console.log this
+		if this.headers?['content-type']?.match(/image\/.*/)?
+			return 'oembedImageWidget'
+
+		if this.parsedUrl?.host is 'www.youtube.com'
+			return 'oembedYoutubeWidget'
+
+		return 'oembedUrlWidget'
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/baseWidget.html b/packages/rocketchat-oembed/client/baseWidget.html
new file mode 100644
index 000000000000..13a68dabe38a
--- /dev/null
+++ b/packages/rocketchat-oembed/client/baseWidget.html
@@ -0,0 +1,3 @@
+<template name="oembedBaseWidget">
+	{{> Template.dynamic template=template }}
+</template>
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html
new file mode 100644
index 000000000000..8e6a1c100e51
--- /dev/null
+++ b/packages/rocketchat-oembed/client/oembedImageWidget.html
@@ -0,0 +1,9 @@
+<template name="oembedImageWidget">
+	<a href="{{url}}">
+		{{#if parsedUrl}}
+			<blockquote>
+				<img src="{{url}}" height="200" />
+			</blockquote>
+		{{/if}}
+	</a>
+</template>
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
new file mode 100644
index 000000000000..9759c8ca23fc
--- /dev/null
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
@@ -0,0 +1,7 @@
+Template.oembedUrlWidget.helpers
+	description: ->
+		if not this.meta?
+			return
+
+
+		return this.meta['og:description'] or this.meta['description']
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.html b/packages/rocketchat-oembed/client/oembedUrlWidget.html
new file mode 100644
index 000000000000..eff848616ecb
--- /dev/null
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.html
@@ -0,0 +1,11 @@
+<template name="oembedUrlWidget">
+	{{#if parsedUrl}}
+		<blockquote>
+			<a href="{{url}}">{{parsedUrl.host}}</a>
+			{{#if description}}
+				<br/>
+				{{description}}
+			{{/if}}
+		</blockquote>
+	{{/if}}
+</template>
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee b/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee
new file mode 100644
index 000000000000..0fb8466eeaf9
--- /dev/null
+++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee
@@ -0,0 +1,3 @@
+Template.oembedYoutubeWidget.helpers
+	player: ->
+		return this.meta?['twitter:player']
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
new file mode 100644
index 000000000000..4d26ae157d00
--- /dev/null
+++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
@@ -0,0 +1,9 @@
+<template name="oembedYoutubeWidget">
+	{{#if parsedUrl}}
+		<blockquote>
+			<a href="{{url}}">{{parsedUrl.host}}</a><br>
+			<iframe width="355" height="200" src="{{player}}" frameborder="0" allowfullscreen></iframe><br>
+			{{meta.description}}
+		</blockquote>
+	{{/if}}
+</template>
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index ce5fa7329852..ceb74779e000 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -9,13 +9,25 @@ Package.onUse(function(api) {
 	api.versionsFrom('1.0');
 
 	api.use([
+		'templating',
 		'coffeescript',
-		'iframely:oembed',
 		'rocketchat:lib@0.0.1'
 	]);
 
-	api.addFiles('server.coffee', ['server']);
-	api.export('OEmbed', ['server']);
+	api.addFiles('client/baseWidget.html', 'client');
+	api.addFiles('client/baseWidget.coffee', 'client');
+
+	api.addFiles('client/oembedImageWidget.html', 'client');
+
+	api.addFiles('client/oembedYoutubeWidget.html', 'client');
+	api.addFiles('client/oembedYoutubeWidget.coffee', 'client');
+
+	api.addFiles('client/oembedUrlWidget.html', 'client');
+	api.addFiles('client/oembedUrlWidget.coffee', 'client');
+
+	api.addFiles('server/server.coffee', 'server');
+
+	api.export('OEmbed', 'server');
 });
 
 Package.onTest(function(api) {

From 103a80a811d26f17625e069846d05fcf2f08186b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 21:16:19 -0300
Subject: [PATCH 08/33] Readd url in oembedUrlWidget

---
 packages/rocketchat-oembed/client/oembedUrlWidget.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.html b/packages/rocketchat-oembed/client/oembedUrlWidget.html
index eff848616ecb..0c62bdd4fc3c 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.html
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.html
@@ -1,4 +1,5 @@
 <template name="oembedUrlWidget">
+	<a href="{{url}}">{{url}}</a>
 	{{#if parsedUrl}}
 		<blockquote>
 			<a href="{{url}}">{{parsedUrl.host}}</a>

From df6713c563bd3678cf822dda445b5b97af6a693c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Jun 2015 21:19:03 -0300
Subject: [PATCH 09/33] Export RocketUrlParser in OEmbed

---
 packages/rocketchat-oembed/server/server.coffee | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee
index ae794fc37d27..425611bcd509 100644
--- a/packages/rocketchat-oembed/server/server.coffee
+++ b/packages/rocketchat-oembed/server/server.coffee
@@ -100,7 +100,7 @@ getRelevantMetaTags = (metaObj) ->
 		return tags
 	return
 
-RocketUrlParser = (message) ->
+OEmbed.RocketUrlParser = (message) ->
 	if Array.isArray message.urls
 		for item in message.urls
 			data = OEmbed.getUrlMeta item.url
@@ -115,13 +115,4 @@ RocketUrlParser = (message) ->
 
 		ChatMessage.update {_id: message._id}, { $set: { urls: message.urls } }
 
-RocketChat.callbacks.add 'afterSaveMessage', RocketUrlParser, RocketChat.callbacks.priority.LOW
-
-# Meteor.methods
-# 	getUrlMeta: (url) ->
-# 		data = OEmbed.getUrlMeta url
-
-# 		console.log data.meta
-# 		console.log data.headers
-
-# 		return data
\ No newline at end of file
+RocketChat.callbacks.add 'afterSaveMessage', OEmbed.RocketUrlParser, RocketChat.callbacks.priority.LOW

From d5c8a0c87531f1625d5396699f8ebdd289ffad71 Mon Sep 17 00:00:00 2001
From: rockhouse <github@ipc-media.net>
Date: Fri, 26 Jun 2015 14:43:54 +0200
Subject: [PATCH 10/33] Implemented delete button next to edit with messages
 and modal confirmation

---
 .meteor/packages                    |  1 +
 .meteor/versions                    |  1 +
 client/lib/chatMessages.coffee      |  7 +++++++
 client/methods/updateMessage.coffee | 10 ++++++++++
 client/stylesheets/base.less        | 17 ++++++++++++++---
 client/views/app/message.html       |  1 +
 client/views/app/room.coffee        | 14 ++++++++++++++
 server/methods/updateMessage.coffee | 10 ++++++++++
 8 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index aa90b2de72b5..4a4bc0c6a199 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -58,3 +58,4 @@ todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
 konecty:nrr
+kevohagan:sweetalert
diff --git a/.meteor/versions b/.meteor/versions
index 9da48a853e8b..322a06a3c8ef 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -46,6 +46,7 @@ jparker:crypto-md5@0.1.1
 jparker:gravatar@0.3.1
 jquery@1.11.3_2
 json@1.0.3
+kevohagan:sweetalert@1.0.0
 konecty:autolinker@1.0.2
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.3
diff --git a/client/lib/chatMessages.coffee b/client/lib/chatMessages.coffee
index ef11ed6de1b0..e9e2d03be9a8 100644
--- a/client/lib/chatMessages.coffee
+++ b/client/lib/chatMessages.coffee
@@ -92,6 +92,12 @@
 			stopTyping()
 			Meteor.call 'sendMessage', { rid: rid, msg: msg, day: window.day }
 
+	deleteMsg = (element) ->
+			id = element.getAttribute("id")
+			Meteor.call 'deleteMessage', { id: id }, (error, result) ->
+				if error
+					return Errors.throw error.reason
+
 	update = (id, input) ->
 		if _.trim(input.value) isnt ''
 			msg = input.value
@@ -171,6 +177,7 @@
 	# isScrollable: isScrollable
 	# toBottom: toBottom
 	keydown: keydown
+	deleteMsg: deleteMsg
 	send: send
 	init: init
 	edit: edit
diff --git a/client/methods/updateMessage.coffee b/client/methods/updateMessage.coffee
index bc10c20a1442..61721f46b734 100644
--- a/client/methods/updateMessage.coffee
+++ b/client/methods/updateMessage.coffee
@@ -15,3 +15,13 @@ Meteor.methods
 				$set:
 					ets: message.ets
 					message: message.msg
+
+	deleteMessage: (message) ->
+		if not Meteor.userId()
+			throw new Meteor.Error 203, t('general.User_logged_out')
+
+		Tracker.nonreactive ->
+
+			ChatMessageHistory.remove
+				_id: message.id
+				'u._id': Meteor.userId()
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index fe290e2c6ec6..6333cfb63a37 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -1956,6 +1956,13 @@ a.github-fork {
 		&.own:hover .edit-message {
 			display: inline-block;
 		}
+		.delete-message {
+			display: none;
+			cursor: pointer;
+		}
+		&.own:hover .delete-message {
+			display: inline-block;
+		}
 		.user {
 			display: inline-block;
 			font-weight: 600;
@@ -1989,8 +1996,8 @@ a.github-fork {
 			.info {
 				position: absolute;
 				text-align: right;
-				left: -15px;
-				width: 55px;
+				left: -20px;
+				width: 65px;
 				.time {
 					display: none;
 				}
@@ -1999,8 +2006,12 @@ a.github-fork {
 				}
 				.edit-message {
 					float: left;
-					margin-left: 5px;
+					margin-left: 1px;
+				}
+				.delete-message {
+					float: left;
 				}
+
 			}
 			&:hover {
 				.time {
diff --git a/client/views/app/message.html b/client/views/app/message.html
index abe36fb80683..dbabfeeda17e 100644
--- a/client/views/app/message.html
+++ b/client/views/app/message.html
@@ -8,6 +8,7 @@
 			<span class="edited">({{_ "edited"}})</span>
 		{{/if}}
 			<i class="icon-pencil edit-message"></i>
+			<i class="icon-trash-1 delete-message"></i>
 		</span>
 		<div class="body" dir="auto">
 			{{{body}}}
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 500e2602362e..2b7dcd5d12b9 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -441,6 +441,20 @@ Template.room.events
 		Session.set('flexOpened', true)
 		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
+	'click .delete-message': (event) ->
+		swal {
+		  title: 'Are you sure?'
+		  text: 'You will not be able to recover!'
+		  type: 'warning'
+		  showCancelButton: true
+		  confirmButtonColor: '#DD6B55'
+		  confirmButtonText: 'Yes, delete it!'
+		  closeOnConfirm: false
+		  html: false
+		}, ->
+		  swal 'Deleted!', 'Your entry has been deleted.', 'success'
+				ChatMessages.deleteMsg(event.currentTarget.parentNode.parentNode)
+
 Template.room.onCreated ->
 	console.log 'room.onCreated' if window.rocketDebug
 	# this.scrollOnBottom = true
diff --git a/server/methods/updateMessage.coffee b/server/methods/updateMessage.coffee
index c9dd16a0c8a9..2a08d6aa4901 100644
--- a/server/methods/updateMessage.coffee
+++ b/server/methods/updateMessage.coffee
@@ -21,3 +21,13 @@ Meteor.methods
 		Meteor.defer ->
 
 			RocketChat.callbacks.run 'afterSaveMessage', message
+
+	deleteMessage: (message) ->
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] deleteMessage -> Invalid user")
+
+		console.log '[methods] deleteMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+
+		ChatMessage.remove
+			_id: message.id
+			'u._id': Meteor.userId

From 852aa09ccc15e18ee9f2583eba6cb093c652fb10 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Fri, 26 Jun 2015 10:46:39 -0300
Subject: [PATCH 11/33] validate u._id

---
 client/methods/hideRoom.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/methods/hideRoom.coffee b/client/methods/hideRoom.coffee
index b250ead7e1b6..7c0d06de107e 100644
--- a/client/methods/hideRoom.coffee
+++ b/client/methods/hideRoom.coffee
@@ -5,6 +5,7 @@ Meteor.methods
 
 		ChatSubscription.update
 			rid: rid
+			'u._id': Meteor.userId()
 		,
 			$set:
 				alert: false

From d1462b3cf7fa96258ea40ab0709166c95d97c333 Mon Sep 17 00:00:00 2001
From: rockhouse <github@ipc-media.net>
Date: Fri, 26 Jun 2015 16:03:11 +0200
Subject: [PATCH 12/33] Added possibility for translation

---
 client/views/app/room.coffee | 17 +++++++++--------
 i18n/en.i18n.json            |  7 ++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 2b7dcd5d12b9..3929dbdd5110 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -443,16 +443,17 @@ Template.room.events
 
 	'click .delete-message': (event) ->
 		swal {
-		  title: 'Are you sure?'
-		  text: 'You will not be able to recover!'
+		  title: t('Are_you_sure')
+		  text: t('You_will_not_be_able_to_recover')
 		  type: 'warning'
-		  showCancelButton: true
-		  confirmButtonColor: '#DD6B55'
-		  confirmButtonText: 'Yes, delete it!'
-		  closeOnConfirm: false
-		  html: false
+			showCancelButton: true
+			confirmButtonColor: '#DD6B55'
+			confirmButtonText: t('Yes_delete_it')
+			cancelButtonText: t('Cancel')
+			closeOnConfirm: false
+			html: false
 		}, ->
-		  swal 'Deleted!', 'Your entry has been deleted.', 'success'
+		  swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success'
 				ChatMessages.deleteMsg(event.currentTarget.parentNode.parentNode)
 
 Template.room.onCreated ->
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index cfd29d653f38..56a722b61844 100755
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -8,6 +8,7 @@
   "and" : "and",
   "are_also_typing" : "are also typing",
   "are_typing" : "are typing",
+  "Are_you_sure" : "Are you sure?",
   "away" : "away",
   "Away" : "Away",
   "busy" : "busy",
@@ -29,6 +30,7 @@
   "Create_new_private_group" : "Create a new private group",
   "Created_at" : "Created at",
   "Direct_Messages" : "Direct Messages",
+  "Deleted" : "Deleted!",
   "edited" : "edited",
   "Email_or_username" : "Email or username",
   "Email_verified" : "Email verified",
@@ -146,5 +148,8 @@
   "Welcome_to_the" : "Welcome to the",
   "you_are_in_preview_mode_of" : "You are in preview mode of channel #<strong>__room_name__</strong>",
   "You_neeed_confirm_email" : "You need to confirm your email to login!",
-  "Your_Open_Source_solution" : "Your own Open Source chat solution"
+  "Your_Open_Source_solution" : "Your own Open Source chat solution",
+  "You_will_not_be_able_to_recover" : "You will not be able to recover!",
+  "Yes_delete_it" : "Yes, delete it!",
+  "Your_entry_has_been_deleted" : "Your entry has been deleted."
 }

From c28b35a3070566f72b441d28caaa63b25981c971 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 26 Jun 2015 13:19:54 -0300
Subject: [PATCH 13/33] Added donate button

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 403608f5c12f..d151dcbec299 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,15 @@ The Complete Open Source Chat Solution
 
 Checkout the latest version at http://rocket.chat
 
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
+
+
 ## About
 
 [![Code Climate][codeclimate-image]][codeclimate-url]
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
 
+
 Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
 
 It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
@@ -150,4 +154,10 @@ Note that Rocket.Chat is distributed under the [MIT License](http://opensource.o
 [codeclimate-image]: https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg
 [codeclimate-url]: https://codeclimate.com/github/RocketChat/Rocket.Chat
 
+### Donate
+
+Rocket.Chat will be free forever, but you can help us speed-up the development!
+
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
+
 :smiling_imp:

From 7bb9cc2d548bec1e3605e21a413fa19afda457dc Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 26 Jun 2015 14:50:19 -0300
Subject: [PATCH 14/33] Update README.md

---
 README.md | 74 +++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index d151dcbec299..088ee4dc11ad 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,11 @@ Checkout the latest version at http://rocket.chat
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
 
-
 ## About
 
-[![Code Climate][codeclimate-image]][codeclimate-url]
+[![Code Climate](https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg)](https://codeclimate.com/github/RocketChat/Rocket.Chat)
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
 
-
 Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) fullstack framework.
 
 It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
@@ -36,40 +34,6 @@ It is a great solution for communities and companies wanting to privately host t
 ##### [clasesdeperiodismo.com](http://www.clasesdeperiodismo.com/2015/05/30/un-chat-de-codigo-abierto-que-puedes-anadir-a-la-web/)
 > Un chat de código abierto que puedes añadir a la web
 
-## Installation
-
-### Development
-
-Prerequisites:
-
-* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-* [Meteor](https://www.meteor.com/install)
-
-Now just clone and start the app:
-
-```sh
-git clone https://github.com/RocketChat/Rocket.Chat.git
-cd Rocket.Chat
-meteor
-```
-
-### Production
-
-#### Docker
-
-[Official Docker Registry](https://registry.hub.docker.com/u/rocketchat/rocket.chat/)
-
-```
-docker pull rocketchat/rocket.chat
-```
-
-#### One-Click Deploy
-
-##### Heroku
-
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
-
-
 ## Features
 
 ### Current
@@ -122,6 +86,39 @@ We are developing the APIs based on the competition, so stay tunned and you will
 
 Checkout [Github Wiki](https://github.com/RocketChat/Rocket.Chat/wiki) (coming soon)
 
+## Production Deployment
+
+### Docker
+
+Use the automated build at our [Official Docker Registry](https://registry.hub.docker.com/u/rocketchat/rocket.chat/)
+
+[![Rocket.Chat logo](https://d207aa93qlcgug.cloudfront.net/1.95.5.qa/img/nav/docker-logo-loggedout.png)](https://registry.hub.docker.com/u/rocketchat/rocket.chat/)
+
+```
+docker pull rocketchat/rocket.chat
+```
+
+### Heroku
+
+Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
+
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
+
+## Development Installation
+
+Prerequisites:
+
+* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+* [Meteor](https://www.meteor.com/install)
+
+Now just clone and start the app:
+
+```sh
+git clone https://github.com/RocketChat/Rocket.Chat.git
+cd Rocket.Chat
+meteor
+```
+
 ## Credits
 
 Thanks to [Diego Sampaio](https://github.com/sampaiodiego), [Gabriel Engel](https://github.com/engelgabriel), [Marcelo Schmidt](https://github.com/marceloschmidt), [Rafael Caferati](https://github.com/rcaferati) e [Rodrigo Nascimento](https://github.com/rodrigok)
@@ -151,9 +148,6 @@ Join the the conversation at [Twitter](http://twitter.com/RocketChatApp), [Faceb
 
 Note that Rocket.Chat is distributed under the [MIT License](http://opensource.org/licenses/MIT).
 
-[codeclimate-image]: https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg
-[codeclimate-url]: https://codeclimate.com/github/RocketChat/Rocket.Chat
-
 ### Donate
 
 Rocket.Chat will be free forever, but you can help us speed-up the development!

From 932bbbf518042373f614b9c47f516a38f2d3e003 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 26 Jun 2015 14:57:59 -0300
Subject: [PATCH 15/33] Update app.json

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index 835b415674a1..ea14a8bdcbbc 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "name": "Rocket.Chat",
   "description": "Have your own open-source Slack-like online chat, built with Meteor.",
   "repository": "https://github.com/RocketChat/Rocket.Chat",
-  "logo": "http://rocket.chat/images/logo/logo-dark.svg",
+  "logo": "https://github.com/raw/RocketChat/Rocket.Chat/master/public/images/logo/512x512.png",
   "keywords": ["meteor", "social", "community", "chat"],
   "website": "http://rocket.chat",
   "env": {

From dac4587e08e4f56ed55f34d2cdd236cb86ed9068 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 15:19:18 -0300
Subject: [PATCH 16/33] Add package konecty:change-case

---
 .meteor/packages | 1 +
 .meteor/versions | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.meteor/packages b/.meteor/packages
index aa90b2de72b5..3044b2ad2241 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -58,3 +58,4 @@ todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
 konecty:nrr
+konecty:change-case
diff --git a/.meteor/versions b/.meteor/versions
index a5bbd3186447..b4fa36ad0580 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -46,6 +46,7 @@ jparker:gravatar@0.3.1
 jquery@1.11.3_2
 json@1.0.3
 konecty:autolinker@1.0.2
+konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.3
 konecty:multiple-instances-status@1.0.3

From bea217de6002fab6c5f81b1495c0ad70294ece8d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 15:20:43 -0300
Subject: [PATCH 17/33] OEmbed: Change meta and headers to camelCase, implement
 cache and improve error catching

---
 .../client/baseWidget.coffee                  |  4 +-
 .../client/oembedUrlWidget.coffee             |  3 +-
 .../client/oembedYoutubeWidget.coffee         |  3 -
 .../client/oembedYoutubeWidget.html           |  2 +-
 packages/rocketchat-oembed/package.js         |  1 -
 .../rocketchat-oembed/server/server.coffee    | 86 ++++++++++++++-----
 6 files changed, 67 insertions(+), 32 deletions(-)
 delete mode 100644 packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee

diff --git a/packages/rocketchat-oembed/client/baseWidget.coffee b/packages/rocketchat-oembed/client/baseWidget.coffee
index eaceb2244fc4..807d55ac3197 100644
--- a/packages/rocketchat-oembed/client/baseWidget.coffee
+++ b/packages/rocketchat-oembed/client/baseWidget.coffee
@@ -1,7 +1,7 @@
 Template.oembedBaseWidget.helpers
 	template: ->
-		console.log this
-		if this.headers?['content-type']?.match(/image\/.*/)?
+		# console.log this
+		if this.headers?.contentType?.match(/image\/.*/)?
 			return 'oembedImageWidget'
 
 		if this.parsedUrl?.host is 'www.youtube.com'
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
index 9759c8ca23fc..98d4bd98ed4a 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
@@ -3,5 +3,4 @@ Template.oembedUrlWidget.helpers
 		if not this.meta?
 			return
 
-
-		return this.meta['og:description'] or this.meta['description']
\ No newline at end of file
+		return this.meta['ogDescription'] or this.meta['description']
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee b/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee
deleted file mode 100644
index 0fb8466eeaf9..000000000000
--- a/packages/rocketchat-oembed/client/oembedYoutubeWidget.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-Template.oembedYoutubeWidget.helpers
-	player: ->
-		return this.meta?['twitter:player']
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
index 4d26ae157d00..67729b8bdbbb 100644
--- a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
+++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
@@ -2,7 +2,7 @@
 	{{#if parsedUrl}}
 		<blockquote>
 			<a href="{{url}}">{{parsedUrl.host}}</a><br>
-			<iframe width="355" height="200" src="{{player}}" frameborder="0" allowfullscreen></iframe><br>
+			<iframe width="355" height="200" src="{{meta.twitterPlayer}}" frameborder="0" allowfullscreen></iframe><br>
 			{{meta.description}}
 		</blockquote>
 	{{/if}}
diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index ceb74779e000..b4459f25d298 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -20,7 +20,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/oembedImageWidget.html', 'client');
 
 	api.addFiles('client/oembedYoutubeWidget.html', 'client');
-	api.addFiles('client/oembedYoutubeWidget.coffee', 'client');
 
 	api.addFiles('client/oembedUrlWidget.html', 'client');
 	api.addFiles('client/oembedUrlWidget.coffee', 'client');
diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee
index 425611bcd509..76569da97bef 100644
--- a/packages/rocketchat-oembed/server/server.coffee
+++ b/packages/rocketchat-oembed/server/server.coffee
@@ -3,7 +3,8 @@ http = Npm.require('http')
 https = Npm.require('https')
 querystring = Npm.require('querystring')
 
-OEmbed = {}
+OEmbed =
+	cache: new Meteor.Collection 'oembed_cache'
 
 getUrlContent = (urlObj, redirectCount = 5, callback) ->
 	if _.isString(urlObj)
@@ -17,19 +18,21 @@ getUrlContent = (urlObj, redirectCount = 5, callback) ->
 
 	httpOrHttps = if urlObj.protocol is 'https:' then https else http
 
+	parsedUrl = _.pick urlObj, ['host', 'hash', 'pathname', 'protocol', 'port', 'query']
+
 	request = httpOrHttps.request opts, (response) ->
 		if response.statusCode is 301 and response.headers.location?
 			request.abort()
 			console.log response.headers.location
 
 			if redirectCount <= 0
-				return callback null, null
+				return callback null, {parsedUrl: parsedUrl}
 
 			getUrlContent response.headers.location, --redirectCount, callback
 			return
 
 		if response.statusCode isnt 200
-			return callback null, null
+			return callback null, {parsedUrl: parsedUrl}
 
 		str = ''
 		response.on 'data', (chunk) ->
@@ -41,9 +44,21 @@ getUrlContent = (urlObj, redirectCount = 5, callback) ->
 			callback null, {
 				headers: response.headers
 				body: str
-				parsedUrl: _.pick urlObj, ['host', 'hash', 'pathname', 'protocol', 'port', 'query']
+				parsedUrl: parsedUrl
+			}
+
+		response.on 'error', (error) ->
+			callback null, {
+				error: error
+				parsedUrl: parsedUrl
 			}
 
+	request.on 'error', (error) ->
+		callback null, {
+			error: error
+			parsedUrl: parsedUrl
+		}
+
 	request.end()
 
 OEmbed.getUrlMeta = (url, withFragment) ->
@@ -64,26 +79,48 @@ OEmbed.getUrlMeta = (url, withFragment) ->
 
 	content = getUrlContentSync urlObj, 5
 
-	metas = {}
+	metas = undefined
+
+	if content?.body?
+		metas = {}
+		content.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
+			metas[changeCase.camelCase(name)] = value
+
+		if metas.fragment is '!' and not withFragment?
+			return OEmbed.getUrlMeta url, true
 
-	content?.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
-		metas[name] = value
+	headers = undefined
 
-	if metas.fragment is '!' and not withFragment?
-		return OEmbed.getUrlMeta url, true
+	if content?.headers?
+		headers = {}
+		for header, value of content.headers
+			headers[changeCase.camelCase(header)] = value
 
 	return {
 		meta: metas
-		headers: content?.headers
+		headers: headers
 		parsedUrl: content.parsedUrl
 	}
 
+OEmbed.getUrlMetaWithCache = (url, withFragment) ->
+	cache = OEmbed.cache.findOne {_id: url}
+	if cache?
+		return cache.data
+
+	data = OEmbed.getUrlMeta url, withFragment
+
+	if data?
+		OEmbed.cache.insert {_id: url, data: data, updatedAt: new Date}
+
+		return data
+
+	return
+
 getRelevantHeaders = (headersObj) ->
 	headers = {}
 	for key, value of headersObj
-		key = key.toLowerCase()
-		if key in ['content-type', 'content-length'] and value?.trim() isnt ''
-			headers[key.replace(/\./g, '-')] = value
+		if key.toLowerCase() in ['contenttype', 'contentlength'] and value?.trim() isnt ''
+			headers[key] = value
 
 	if Object.keys(headers).length > 0
 		return headers
@@ -92,9 +129,8 @@ getRelevantHeaders = (headersObj) ->
 getRelevantMetaTags = (metaObj) ->
 	tags = {}
 	for key, value of metaObj
-		key = key.toLowerCase()
-		if /^(og|fb|twitter):.+|description$/.test(key) and value?.trim() isnt ''
-			tags[key.replace(/\./g, '-')] = value
+		if /^(og|fb|twitter).+|description$/.test(key.toLowerCase()) and value?.trim() isnt ''
+			tags[key] = value
 
 	if Object.keys(tags).length > 0
 		return tags
@@ -102,17 +138,21 @@ getRelevantMetaTags = (metaObj) ->
 
 OEmbed.RocketUrlParser = (message) ->
 	if Array.isArray message.urls
+		changed = false
 		for item in message.urls
-			data = OEmbed.getUrlMeta item.url
+			data = OEmbed.getUrlMetaWithCache item.url
 
-			if data?.meta?
-				item.meta = getRelevantMetaTags data.meta
+			if data?
+				if data.meta?
+					item.meta = getRelevantMetaTags data.meta
 
-			if data?.headers?
-				item.headers = getRelevantHeaders data.headers
+				if data.headers?
+					item.headers = getRelevantHeaders data.headers
 
-			item.parsedUrl = data.parsedUrl
+				item.parsedUrl = data.parsedUrl
+				changed = true
 
-		ChatMessage.update {_id: message._id}, { $set: { urls: message.urls } }
+		if changed is true
+			ChatMessage.update {_id: message._id}, { $set: { urls: message.urls } }
 
 RocketChat.callbacks.add 'afterSaveMessage', OEmbed.RocketUrlParser, RocketChat.callbacks.priority.LOW

From 3550dc034b0aea87e5df2c6956dd9ee9cadf90d5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 15:20:57 -0300
Subject: [PATCH 18/33] Create migration to update message urls

---
 server/startup/migrations/v7.coffee | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 server/startup/migrations/v7.coffee

diff --git a/server/startup/migrations/v7.coffee b/server/startup/migrations/v7.coffee
new file mode 100644
index 000000000000..f44c35032bf2
--- /dev/null
+++ b/server/startup/migrations/v7.coffee
@@ -0,0 +1,19 @@
+Meteor.startup ->
+	Migrations.add
+		version: 7
+		up: ->
+
+			console.log 'Populate urls in messages'
+			query = ChatMessage.find({ 'urls.0': { $exists: true }, urls: { $type: 2 } })
+			count = query.count()
+			query.forEach (message, index) ->
+				console.log "#{index + 1} / #{count}"
+
+				message.urls = message.urls.map (url) ->
+					if _.isString url
+						return {url: url}
+					return url
+
+				OEmbed.RocketUrlParser message
+
+			console.log 'End'

From f8e542e8a932ade8b8a3db0c5f227ad8781b9ac5 Mon Sep 17 00:00:00 2001
From: rockhouse <github@ipc-media.net>
Date: Fri, 26 Jun 2015 20:33:26 +0200
Subject: [PATCH 19/33] Prevent system msg from being deleted and enable
 reactivity again

---
 client/lib/collections.coffee       | 3 +++
 client/methods/updateMessage.coffee | 4 ++--
 client/views/app/room.coffee        | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee
index 1b5c116c1a2e..e312eedc8af4 100644
--- a/client/lib/collections.coffee
+++ b/client/lib/collections.coffee
@@ -13,3 +13,6 @@ Meteor.startup ->
 
 		changed: (record) ->
 			ChatMessageHistory.update {_id: record._id, msg: {$ne: record.msg}}, record
+
+		removed: (record) ->
+			ChatMessageHistory.remove {_id: record._id} 
diff --git a/client/methods/updateMessage.coffee b/client/methods/updateMessage.coffee
index 61721f46b734..edad52307844 100644
--- a/client/methods/updateMessage.coffee
+++ b/client/methods/updateMessage.coffee
@@ -21,7 +21,7 @@ Meteor.methods
 			throw new Meteor.Error 203, t('general.User_logged_out')
 
 		Tracker.nonreactive ->
-
-			ChatMessageHistory.remove
+			
+			ChatMessage.remove
 				_id: message.id
 				'u._id': Meteor.userId()
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 3929dbdd5110..bdbe1dcdecc7 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -442,6 +442,8 @@ Template.room.events
 		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
 	'click .delete-message': (event) ->
+		msg = event.currentTarget.parentNode.parentNode
+		return if msg.classList.contains("system")
 		swal {
 		  title: t('Are_you_sure')
 		  text: t('You_will_not_be_able_to_recover')
@@ -454,7 +456,7 @@ Template.room.events
 			html: false
 		}, ->
 		  swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success'
-				ChatMessages.deleteMsg(event.currentTarget.parentNode.parentNode)
+				ChatMessages.deleteMsg(msg)
 
 Template.room.onCreated ->
 	console.log 'room.onCreated' if window.rocketDebug

From 52ec9fe58c104c2b47dea7fdc8945653f149c916 Mon Sep 17 00:00:00 2001
From: rockhouse <github@ipc-media.net>
Date: Fri, 26 Jun 2015 20:53:18 +0200
Subject: [PATCH 20/33] Fixed indentation

---
 client/views/app/room.coffee | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index bdbe1dcdecc7..29201639e5cd 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -445,9 +445,9 @@ Template.room.events
 		msg = event.currentTarget.parentNode.parentNode
 		return if msg.classList.contains("system")
 		swal {
-		  title: t('Are_you_sure')
-		  text: t('You_will_not_be_able_to_recover')
-		  type: 'warning'
+			title: t('Are_you_sure')
+			text: t('You_will_not_be_able_to_recover')
+			type: 'warning'
 			showCancelButton: true
 			confirmButtonColor: '#DD6B55'
 			confirmButtonText: t('Yes_delete_it')
@@ -455,8 +455,8 @@ Template.room.events
 			closeOnConfirm: false
 			html: false
 		}, ->
-		  swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success'
-				ChatMessages.deleteMsg(msg)
+			swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success'
+			ChatMessages.deleteMsg(msg)
 
 Template.room.onCreated ->
 	console.log 'room.onCreated' if window.rocketDebug

From 1820544f0a175f5ac8848ad1909cebbb375afafc Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 15:59:21 -0300
Subject: [PATCH 21/33] Only load viedeo for youtube urls with twitterPlayer
 meta

---
 packages/rocketchat-oembed/client/baseWidget.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-oembed/client/baseWidget.coffee b/packages/rocketchat-oembed/client/baseWidget.coffee
index 807d55ac3197..ff7fad5da802 100644
--- a/packages/rocketchat-oembed/client/baseWidget.coffee
+++ b/packages/rocketchat-oembed/client/baseWidget.coffee
@@ -4,7 +4,7 @@ Template.oembedBaseWidget.helpers
 		if this.headers?.contentType?.match(/image\/.*/)?
 			return 'oembedImageWidget'
 
-		if this.parsedUrl?.host is 'www.youtube.com'
+		if this.parsedUrl?.host is 'www.youtube.com' and this.meta?.twitterPlayer?
 			return 'oembedYoutubeWidget'
 
 		return 'oembedUrlWidget'
\ No newline at end of file

From ca67b6308cd7067ea0dc9e64aa2bfaf7142f32f1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 15:59:54 -0300
Subject: [PATCH 22/33] Load ogImage or twitterImage from urls

---
 .../client/oembedImageWidget.html             |  2 +-
 .../client/oembedUrlWidget.coffee             |  8 ++++++-
 .../client/oembedUrlWidget.html               | 22 +++++++++++++++----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html
index 8e6a1c100e51..eae96876634a 100644
--- a/packages/rocketchat-oembed/client/oembedImageWidget.html
+++ b/packages/rocketchat-oembed/client/oembedImageWidget.html
@@ -1,5 +1,5 @@
 <template name="oembedImageWidget">
-	<a href="{{url}}">
+	<a href="{{url}}" target="_blank">
 		{{#if parsedUrl}}
 			<blockquote>
 				<img src="{{url}}" height="200" />
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
index 98d4bd98ed4a..475011a081ed 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
@@ -3,4 +3,10 @@ Template.oembedUrlWidget.helpers
 		if not this.meta?
 			return
 
-		return this.meta['ogDescription'] or this.meta['description']
\ No newline at end of file
+		return this.meta['ogDescription'] or this.meta['description']
+
+	image: ->
+		if not this.meta?
+			return
+
+		return this.meta['ogImage'] or this.meta['twitterImage']
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.html b/packages/rocketchat-oembed/client/oembedUrlWidget.html
index 0c62bdd4fc3c..55f102a6b821 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.html
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.html
@@ -1,11 +1,25 @@
 <template name="oembedUrlWidget">
-	<a href="{{url}}">{{url}}</a>
+	<a href="{{url}}" target="_blank">{{url}}</a>
 	{{#if parsedUrl}}
 		<blockquote>
-			<a href="{{url}}">{{parsedUrl.host}}</a>
+			<a href="{{url}}" target="_blank">{{parsedUrl.host}}</a>
 			{{#if description}}
-				<br/>
-				{{description}}
+				<div style="{{#if image}}min-height: 50px;{{/if}}">
+					{{#if image}}
+						{{#if meta.ogImageUserGenerated}}
+							<div>
+								<a href="{{url}}" target="_blank">
+									<img src="{{image}}" height="200" />
+								</a>
+							</div>
+						{{else}}
+							<a href="{{url}}" target="_blank">
+								<img src="{{image}}" height="50" align="left" style="margin-right: 5px;"/>
+							</a>
+						{{/if}}
+					{{/if}}
+					{{description}}
+				</div>
 			{{/if}}
 		</blockquote>
 	{{/if}}

From b328c000e8699f540d9213d9eb39bd5d1194941e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 16:33:43 -0300
Subject: [PATCH 23/33] Get meta tags from html in wrong order

---
 packages/rocketchat-oembed/server/server.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee
index 76569da97bef..4ac3f1a5a11d 100644
--- a/packages/rocketchat-oembed/server/server.coffee
+++ b/packages/rocketchat-oembed/server/server.coffee
@@ -86,6 +86,9 @@ OEmbed.getUrlMeta = (url, withFragment) ->
 		content.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
 			metas[changeCase.camelCase(name)] = value
 
+		content.body.replace /<meta.*content=['"]([^'"]*)['"].*(?:name|property)=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
+			metas[changeCase.camelCase(name)] = value
+
 		if metas.fragment is '!' and not withFragment?
 			return OEmbed.getUrlMeta url, true
 

From bec28a630980da50807a31f62b9d0e45f8af3d2e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 17:02:04 -0300
Subject: [PATCH 24/33] OEmbed: Improve meta tag parser

---
 packages/rocketchat-oembed/server/server.coffee | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee
index 4ac3f1a5a11d..be073f014927 100644
--- a/packages/rocketchat-oembed/server/server.coffee
+++ b/packages/rocketchat-oembed/server/server.coffee
@@ -83,12 +83,22 @@ OEmbed.getUrlMeta = (url, withFragment) ->
 
 	if content?.body?
 		metas = {}
-		content.body.replace /<meta.*(?:name|property)=['"]([^'"]*)['"].*content=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
+		content.body.replace /<title>(.+)<\/title>/gmi, (meta, title) ->
+			metas.pageTitle = title
+
+		content.body.replace /<meta[^>]*(?:name|property)=[']([^']*)['][^>]*content=[']([^']*)['][^>]*>/gmi, (meta, name, value) ->
+			metas[changeCase.camelCase(name)] = value
+
+		content.body.replace /<meta[^>]*(?:name|property)=["]([^"]*)["][^>]*content=["]([^"]*)["][^>]*>/gmi, (meta, name, value) ->
 			metas[changeCase.camelCase(name)] = value
 
-		content.body.replace /<meta.*content=['"]([^'"]*)['"].*(?:name|property)=['"]([^'"]*)['"].*>/gmi, (meta, name, value) ->
+		content.body.replace /<meta[^>]*content=[']([^']*)['][^>]*(?:name|property)=[']([^']*)['][^>]*>/gmi, (meta, value, name) ->
 			metas[changeCase.camelCase(name)] = value
 
+		content.body.replace /<meta[^>]*content=["]([^"]*)["][^>]*(?:name|property)=["]([^"]*)["][^>]*>/gmi, (meta, value, name) ->
+			metas[changeCase.camelCase(name)] = value
+
+
 		if metas.fragment is '!' and not withFragment?
 			return OEmbed.getUrlMeta url, true
 

From 29dccd3b47659d0d9050dcb41c93bcd0649288f5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 17:04:44 -0300
Subject: [PATCH 25/33] OEmbed: Show page title in url widget

---
 .../client/oembedUrlWidget.coffee             | 10 ++++--
 .../client/oembedUrlWidget.html               | 33 ++++++++++---------
 .../rocketchat-oembed/server/server.coffee    |  2 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
index 475011a081ed..053f7045ce81 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
@@ -3,10 +3,16 @@ Template.oembedUrlWidget.helpers
 		if not this.meta?
 			return
 
-		return this.meta['ogDescription'] or this.meta['description']
+		return this.meta.ogDescription or this.meta.twitterDescription or this.meta.description
+
+	title: ->
+		if not this.meta?
+			return
+
+		return this.meta.ogTitle or this.meta.twitterTitle or this.meta.title or this.meta.pageTitle
 
 	image: ->
 		if not this.meta?
 			return
 
-		return this.meta['ogImage'] or this.meta['twitterImage']
\ No newline at end of file
+		return this.meta.ogImage or this.meta.twitterImage
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.html b/packages/rocketchat-oembed/client/oembedUrlWidget.html
index 55f102a6b821..09e87a722538 100644
--- a/packages/rocketchat-oembed/client/oembedUrlWidget.html
+++ b/packages/rocketchat-oembed/client/oembedUrlWidget.html
@@ -3,24 +3,27 @@
 	{{#if parsedUrl}}
 		<blockquote>
 			<a href="{{url}}" target="_blank">{{parsedUrl.host}}</a>
-			{{#if description}}
-				<div style="{{#if image}}min-height: 50px;{{/if}}">
-					{{#if image}}
-						{{#if meta.ogImageUserGenerated}}
-							<div>
-								<a href="{{url}}" target="_blank">
-									<img src="{{image}}" height="200" />
-								</a>
-							</div>
-						{{else}}
+			<div style="{{#if image}}min-height: 60px;{{/if}}">
+				{{#if image}}
+					{{#if meta.ogImageUserGenerated}}
+						<div>
 							<a href="{{url}}" target="_blank">
-								<img src="{{image}}" height="50" align="left" style="margin-right: 5px;"/>
+								<img src="{{image}}" height="200" />
 							</a>
-						{{/if}}
+						</div>
+					{{else}}
+						<a href="{{url}}" target="_blank">
+							<img src="{{image}}" height="60" align="left" style="margin-right: 5px;"/>
+						</a>
 					{{/if}}
-					{{description}}
-				</div>
-			{{/if}}
+				{{/if}}
+				{{#if title}}
+					<div>
+						<strong>{{title}}</strong>
+					</div>
+				{{/if}}
+				{{description}}
+			</div>
 		</blockquote>
 	{{/if}}
 </template>
\ No newline at end of file
diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee
index be073f014927..9d8db27ab6d1 100644
--- a/packages/rocketchat-oembed/server/server.coffee
+++ b/packages/rocketchat-oembed/server/server.coffee
@@ -142,7 +142,7 @@ getRelevantHeaders = (headersObj) ->
 getRelevantMetaTags = (metaObj) ->
 	tags = {}
 	for key, value of metaObj
-		if /^(og|fb|twitter).+|description$/.test(key.toLowerCase()) and value?.trim() isnt ''
+		if /^(og|fb|twitter).+|description|title|pageTitle$/.test(key.toLowerCase()) and value?.trim() isnt ''
 			tags[key] = value
 
 	if Object.keys(tags).length > 0

From be53a6fbf01dc265481efd1521dc738efc6bddee Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 26 Jun 2015 18:26:34 -0300
Subject: [PATCH 26/33] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 088ee4dc11ad..64a469844185 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,8 @@ It is a great solution for communities and companies wanting to privately host t
 - Transcripts / History
 - I18n - [Internationalization with Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard)
 - Hubot Friendly - [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat)
-- Media Embeds - [Iframely Responsive Web Embeds](https://github.com/itteco/iframely)
+- Media Embeds
+- Link Previews
 - LDAP Authentication - [LDAP Authentication on Rocket.Chat Wiki](https://github.com/RocketChat/Rocket.Chat/wiki/LDAP-Authentication)
 
 ### Roadmap for v1.0

From f955ad2f3c98a8b068613e2aaa7d95bdb13ae7d1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 19:26:30 -0300
Subject: [PATCH 27/33] Update migration 7 to interate over all messages with
 urls

---
 server/startup/migrations/v7.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/startup/migrations/v7.coffee b/server/startup/migrations/v7.coffee
index f44c35032bf2..edad19d6cf9d 100644
--- a/server/startup/migrations/v7.coffee
+++ b/server/startup/migrations/v7.coffee
@@ -4,7 +4,7 @@ Meteor.startup ->
 		up: ->
 
 			console.log 'Populate urls in messages'
-			query = ChatMessage.find({ 'urls.0': { $exists: true }, urls: { $type: 2 } })
+			query = ChatMessage.find({ 'urls.0': { $exists: true } })
 			count = query.count()
 			query.forEach (message, index) ->
 				console.log "#{index + 1} / #{count}"

From 629823744b5aea7be08b0e94379237ba8812b410 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Fri, 26 Jun 2015 20:32:02 -0300
Subject: [PATCH 28/33] added fs = Npm.require('fs') path = Npm.require('path')

---
 packages/rocketchat-hubot/hubot.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-hubot/hubot.coffee b/packages/rocketchat-hubot/hubot.coffee
index a4f397a323ab..951b8f1b8cba 100644
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@@ -3,8 +3,8 @@ CoffeeScript.register()
 
 Hubot = Npm.require('hubot')
 
-fs = require('fs')
-path = require('path')
+fs = Npm.require('fs')
+path = Npm.require('path')
 
 # Start a hubot, connected to our chat room.
 'use strict'

From 0fe159f55b1f338e00291979f8aee30458ec2afd Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 21:44:07 -0300
Subject: [PATCH 29/33] RocketBot working

---
 .meteor/packages                              |   2 +-
 .meteor/versions                              |   1 +
 .../.npm/package/npm-shrinkwrap.json          | 428 +++++++++---------
 packages/rocketchat-hubot/hubot.coffee        |  36 +-
 server/methods/addUserToRoom.coffee           |  97 ++--
 server/methods/sendMessage.coffee             | 167 +++----
 6 files changed, 375 insertions(+), 356 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index e5a7c1f10376..f2522731adde 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -42,7 +42,7 @@ rocketchat:autolinker
 rocketchat:emojione
 rocketchat:file
 rocketchat:highlight
-#rocketchat:hubot
+rocketchat:hubot
 #rocketchat:irc
 rocketchat:ldap
 rocketchat:lib
diff --git a/.meteor/versions b/.meteor/versions
index 215703e3f2fa..76f70953e44f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -98,6 +98,7 @@ rocketchat:autolinker@0.0.1
 rocketchat:emojione@0.0.1
 rocketchat:file@0.0.1
 rocketchat:highlight@0.0.1
+rocketchat:hubot@0.0.1
 rocketchat:ldap@0.0.1
 rocketchat:lib@0.0.1
 rocketchat:markdown@0.0.1
diff --git a/packages/rocketchat-hubot/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-hubot/.npm/package/npm-shrinkwrap.json
index 370832fe5fd8..bbbf4f40cb60 100644
--- a/packages/rocketchat-hubot/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-hubot/.npm/package/npm-shrinkwrap.json
@@ -1,220 +1,5 @@
 {
   "dependencies": {
-    "codex-blackboard-hubot-scripts": {
-      "version": "https://github.com/cscott/codex-blackboard-hubot-scripts/tarball/f57c178a2faee9b36d07a7905c29093b9824e0b0",
-      "dependencies": {
-        "hubot-calculator": {
-          "version": "0.4.0",
-          "dependencies": {
-            "coffee-script": {
-              "version": "1.6.3"
-            },
-            "mathjs": {
-              "version": "1.7.0",
-              "dependencies": {
-                "decimal.js": {
-                  "version": "4.0.2"
-                }
-              }
-            }
-          }
-        },
-        "hubot-google-hangouts": {
-          "version": "0.7.1",
-          "dependencies": {
-            "coffee-script": {
-              "version": "1.6.3"
-            },
-            "googleapis": {
-              "version": "0.4.7",
-              "dependencies": {
-                "request": {
-                  "version": "2.25.0",
-                  "dependencies": {
-                    "qs": {
-                      "version": "0.6.6"
-                    },
-                    "json-stringify-safe": {
-                      "version": "5.0.1"
-                    },
-                    "forever-agent": {
-                      "version": "0.5.2"
-                    },
-                    "tunnel-agent": {
-                      "version": "0.3.0"
-                    },
-                    "http-signature": {
-                      "version": "0.10.1",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.5"
-                        },
-                        "asn1": {
-                          "version": "0.1.11"
-                        },
-                        "ctype": {
-                          "version": "0.5.3"
-                        }
-                      }
-                    },
-                    "hawk": {
-                      "version": "1.0.0",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "0.9.1"
-                        },
-                        "boom": {
-                          "version": "0.4.2"
-                        },
-                        "cryptiles": {
-                          "version": "0.2.2"
-                        },
-                        "sntp": {
-                          "version": "0.2.4"
-                        }
-                      }
-                    },
-                    "aws-sign": {
-                      "version": "0.3.0"
-                    },
-                    "oauth-sign": {
-                      "version": "0.3.0"
-                    },
-                    "cookie-jar": {
-                      "version": "0.3.0"
-                    },
-                    "node-uuid": {
-                      "version": "1.4.3"
-                    },
-                    "mime": {
-                      "version": "1.2.11"
-                    },
-                    "form-data": {
-                      "version": "0.1.4",
-                      "dependencies": {
-                        "combined-stream": {
-                          "version": "0.0.7",
-                          "dependencies": {
-                            "delayed-stream": {
-                              "version": "0.0.5"
-                            }
-                          }
-                        },
-                        "async": {
-                          "version": "0.9.2"
-                        }
-                      }
-                    }
-                  }
-                },
-                "async": {
-                  "version": "0.2.6"
-                },
-                "gapitoken": {
-                  "version": "0.1.0",
-                  "dependencies": {
-                    "jws": {
-                      "version": "0.0.2",
-                      "dependencies": {
-                        "tap": {
-                          "version": "0.3.3",
-                          "dependencies": {
-                            "inherits": {
-                              "version": "1.0.0"
-                            },
-                            "yamlish": {
-                              "version": "0.0.5"
-                            },
-                            "slide": {
-                              "version": "1.1.6"
-                            },
-                            "runforcover": {
-                              "version": "0.0.2",
-                              "dependencies": {
-                                "bunker": {
-                                  "version": "0.1.2",
-                                  "dependencies": {
-                                    "burrito": {
-                                      "version": "0.2.12",
-                                      "dependencies": {
-                                        "traverse": {
-                                          "version": "0.5.2"
-                                        },
-                                        "uglify-js": {
-                                          "version": "1.1.1"
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "nopt": {
-                              "version": "2.2.1",
-                              "dependencies": {
-                                "abbrev": {
-                                  "version": "1.0.7"
-                                }
-                              }
-                            },
-                            "mkdirp": {
-                              "version": "0.3.5"
-                            },
-                            "difflet": {
-                              "version": "0.2.6",
-                              "dependencies": {
-                                "traverse": {
-                                  "version": "0.6.6"
-                                },
-                                "charm": {
-                                  "version": "0.1.2"
-                                },
-                                "deep-is": {
-                                  "version": "0.1.3"
-                                }
-                              }
-                            },
-                            "deep-equal": {
-                              "version": "0.0.0"
-                            },
-                            "buffer-equal": {
-                              "version": "0.0.1"
-                            }
-                          }
-                        },
-                        "base64url": {
-                          "version": "0.0.3"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "hubot-google-images": {
-          "version": "0.1.5"
-        },
-        "hubot-google-translate": {
-          "version": "0.1.0"
-        },
-        "hubot-help": {
-          "version": "0.1.1"
-        },
-        "hubot-scripts": {
-          "version": "2.16.1",
-          "dependencies": {
-            "redis": {
-              "version": "0.8.4"
-            }
-          }
-        },
-        "hubot-youtube": {
-          "version": "0.1.2"
-        }
-      }
-    },
     "coffee-script": {
       "version": "1.9.3"
     },
@@ -739,6 +524,219 @@
           "version": "0.11.0"
         }
       }
+    },
+    "hubot-calculator": {
+      "version": "0.4.0",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.6.3"
+        },
+        "mathjs": {
+          "version": "1.7.0",
+          "dependencies": {
+            "decimal.js": {
+              "version": "4.0.2"
+            }
+          }
+        }
+      }
+    },
+    "hubot-google-hangouts": {
+      "version": "0.7.1",
+      "dependencies": {
+        "coffee-script": {
+          "version": "1.6.3"
+        },
+        "googleapis": {
+          "version": "0.4.7",
+          "dependencies": {
+            "request": {
+              "version": "2.25.0",
+              "dependencies": {
+                "qs": {
+                  "version": "0.6.6"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1"
+                },
+                "forever-agent": {
+                  "version": "0.5.2"
+                },
+                "tunnel-agent": {
+                  "version": "0.3.0"
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5"
+                    },
+                    "asn1": {
+                      "version": "0.1.11"
+                    },
+                    "ctype": {
+                      "version": "0.5.3"
+                    }
+                  }
+                },
+                "hawk": {
+                  "version": "1.0.0",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1"
+                    },
+                    "boom": {
+                      "version": "0.4.2"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2"
+                    },
+                    "sntp": {
+                      "version": "0.2.4"
+                    }
+                  }
+                },
+                "aws-sign": {
+                  "version": "0.3.0"
+                },
+                "oauth-sign": {
+                  "version": "0.3.0"
+                },
+                "cookie-jar": {
+                  "version": "0.3.0"
+                },
+                "node-uuid": {
+                  "version": "1.4.3"
+                },
+                "mime": {
+                  "version": "1.2.11"
+                },
+                "form-data": {
+                  "version": "0.1.4",
+                  "dependencies": {
+                    "combined-stream": {
+                      "version": "0.0.7",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "0.0.5"
+                        }
+                      }
+                    },
+                    "async": {
+                      "version": "0.9.2"
+                    }
+                  }
+                }
+              }
+            },
+            "async": {
+              "version": "0.2.6"
+            },
+            "gapitoken": {
+              "version": "0.1.0",
+              "dependencies": {
+                "jws": {
+                  "version": "0.0.2",
+                  "dependencies": {
+                    "tap": {
+                      "version": "0.3.3",
+                      "dependencies": {
+                        "inherits": {
+                          "version": "1.0.0"
+                        },
+                        "yamlish": {
+                          "version": "0.0.5"
+                        },
+                        "slide": {
+                          "version": "1.1.6"
+                        },
+                        "runforcover": {
+                          "version": "0.0.2",
+                          "dependencies": {
+                            "bunker": {
+                              "version": "0.1.2",
+                              "dependencies": {
+                                "burrito": {
+                                  "version": "0.2.12",
+                                  "dependencies": {
+                                    "traverse": {
+                                      "version": "0.5.2"
+                                    },
+                                    "uglify-js": {
+                                      "version": "1.1.1"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "nopt": {
+                          "version": "2.2.1",
+                          "dependencies": {
+                            "abbrev": {
+                              "version": "1.0.7"
+                            }
+                          }
+                        },
+                        "mkdirp": {
+                          "version": "0.3.5"
+                        },
+                        "difflet": {
+                          "version": "0.2.6",
+                          "dependencies": {
+                            "traverse": {
+                              "version": "0.6.6"
+                            },
+                            "charm": {
+                              "version": "0.1.2"
+                            },
+                            "deep-is": {
+                              "version": "0.1.3"
+                            }
+                          }
+                        },
+                        "deep-equal": {
+                          "version": "0.0.0"
+                        },
+                        "buffer-equal": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    },
+                    "base64url": {
+                      "version": "0.0.3"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "hubot-google-images": {
+      "version": "0.1.5"
+    },
+    "hubot-google-translate": {
+      "version": "0.2.0"
+    },
+    "hubot-help": {
+      "version": "0.1.1"
+    },
+    "hubot-maps": {
+      "version": "0.0.2"
+    },
+    "hubot-scripts": {
+      "version": "2.16.1",
+      "dependencies": {
+        "redis": {
+          "version": "0.8.4"
+        }
+      }
+    },
+    "hubot-youtube": {
+      "version": "1.0.0"
     }
   }
 }
diff --git a/packages/rocketchat-hubot/hubot.coffee b/packages/rocketchat-hubot/hubot.coffee
index a4f397a323ab..67cd5e54dd84 100644
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@@ -3,8 +3,8 @@ CoffeeScript.register()
 
 Hubot = Npm.require('hubot')
 
-fs = require('fs')
-path = require('path')
+fs = Npm.require('fs')
+path = Npm.require('path')
 
 # Start a hubot, connected to our chat room.
 'use strict'
@@ -12,6 +12,8 @@ path = require('path')
 # Log messages?
 DEBUG = true
 
+rocketUser = Meteor.users.findOne({username: 'rocketbot'})
+
 # Monkey-patch Hubot to support private messages
 Hubot.Response::priv = (strings...) ->
 	@robot.adapter.priv @envelope, strings...
@@ -51,14 +53,15 @@ class RocketChatAdapter extends Hubot.Adapter
 	#
 	# Returns nothing.
 	send: (envelope, strings...) ->
+		console.log envelope, strings
 		sendHelper @robot, envelope, strings, (string) =>
-			console.log "send #{envelope.rid}: #{string} (#{envelope.u.username})" if DEBUG
+			console.log "send #{envelope.user.rid}: #{string} (#{envelope.user.id})" if DEBUG
 			return @priv envelope, string if envelope.message.private
-			Meteor.call "sendMessage",
+			RocketChat.sendMessage rocketUser._id,
 				u:
 					username: "rocketbot"
 				msg: string
-				rid: envelope.rid
+				rid: envelope.user.rid
 
 	# Public: Raw method for sending emote data back to the chat source.
 	#
@@ -80,13 +83,13 @@ class RocketChatAdapter extends Hubot.Adapter
 	# Priv: our extension -- send a PM to user
 	priv: (envelope, strings...) ->
 		sendHelper @robot, envelope, strings, (string) ->
-			console.log "priv #{envelope.rid}: #{string} (#{envelope.u.username})" if DEBUG
+			console.log "priv #{envelope.user.rid}: #{string} (#{envelope.user.id})" if DEBUG
 			Meteor.call "sendMessage",
 				u:
 					username: "rocketbot"
-				to: "#{envelope.u.username}"
+				to: "#{envelope.user.id}"
 				msg: string
-				rid: envelope.rid
+				rid: envelope.user.rid
 
 	# Public: Raw method for building a reply and sending it back to the chat
 	# source. Extend this.
@@ -121,6 +124,7 @@ class RocketChatAdapter extends Hubot.Adapter
 	#
 	# Returns nothing.
 	run: ->
+		console.log 'run'
 
 	# Public: Raw method for shutting the bot down. Extend this.
 	#
@@ -129,11 +133,18 @@ class RocketChatAdapter extends Hubot.Adapter
 
 class RocketBotReceiver
 	constructor: (message) ->
+		if message.u.username is 'rocketbot'
+			return message
+
 		RocketBotUser = new Hubot.User(message.u.username, rid: message.rid)
 		RocketBotTextMessage = new Hubot.TextMessage(RocketBotUser, message.msg, message._id)
+
+		console.log {rid: message.rid, username:message.u.username}
+		# RocketChat.addUserToRoom rocketUser._id, {rid: message.rid, username:message.u.username}
+
 		RocketBot.adapter.receive RocketBotTextMessage
-		console.log 'message: ', message if DEBUG
-		console.log 'RocketBot: ', RocketBot if DEBUG
+		# console.log 'message: ', message if DEBUG
+		# console.log 'RocketBot: ', RocketBot if DEBUG
 		return message
 
 class HubotScripts
@@ -186,7 +197,10 @@ sendHelper = Meteor.bindEnvironment (robot, envelope, strings, map) ->
 RocketBot = new Robot null, null, false, 'rocketbot'
 RocketBot.alias = 'bot'
 RocketBot.adapter = new RocketChatAdapter RocketBot
-HubotScripts(RocketBot)
+# HubotScripts(RocketBot)
+
+RocketBot.hear /test/i, (res) ->
+	res.send "Test? TESTING? WE DON'T NEED NO TEST, EVERYTHING WORKS!"
 
 RocketChat.callbacks.add 'afterSaveMessage', RocketBotReceiver, RocketChat.callbacks.priority.LOW
 
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
index 06e8a2d92fa9..bed32aed1379 100644
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@@ -1,49 +1,52 @@
+RocketChat.addUserToRoom = (userId, data) ->
+	fromId = userId
+	# console.log '[methods] addUserToRoom -> '.green, 'fromId:', fromId, 'data:', data
+
+	room = ChatRoom.findOne data.rid
+
+	# if room.username isnt Meteor.user().username and room.t is 'c'
+	if room.u.username isnt Meteor.users.findOne(userId).username and room.t is 'c'
+		throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
+
+	# verify if user is already in room
+	if room.usernames.indexOf(data.username) isnt -1
+		return
+
+	now = new Date()
+
+	update =
+		$push:
+			usernames:
+				$each: [data.username]
+				$sort: 1
+
+	newUser = Meteor.users.findOne username: data.username
+
+	ChatRoom.update data.rid, update
+
+	ChatSubscription.insert
+		rid: data.rid
+		ts: now
+		name: room.name
+		t: room.t
+		open: true
+		alert: true
+		unread: 1
+		u:
+			_id: newUser._id
+			username: data.username
+
+	ChatMessage.insert
+		rid: data.rid
+		ts: now
+		t: 'au'
+		msg: newUser.name
+		u:
+			_id: fromId
+			username: Meteor.users.findOne(userId).username
+
+	return true
+
 Meteor.methods
 	addUserToRoom: (data) ->
-		fromId = Meteor.userId()
-		# console.log '[methods] addUserToRoom -> '.green, 'fromId:', fromId, 'data:', data
-
-		room = ChatRoom.findOne data.rid
-
-		# if room.username isnt Meteor.user().username and room.t is 'c'
-		if room.u.username isnt Meteor.user().username and room.t is 'c'
-			throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
-
-		# verify if user is already in room
-		if room.usernames.indexOf(data.username) isnt -1
-			return
-
-		now = new Date()
-
-		update =
-			$push:
-				usernames:
-					$each: [data.username]
-					$sort: 1
-
-		newUser = Meteor.users.findOne username: data.username
-
-		ChatRoom.update data.rid, update
-
-		ChatSubscription.insert
-			rid: data.rid
-			ts: now
-			name: room.name
-			t: room.t
-			open: true
-			alert: true
-			unread: 1
-			u:
-				_id: newUser._id
-				username: data.username
-
-		ChatMessage.insert
-			rid: data.rid
-			ts: now
-			t: 'au'
-			msg: newUser.name
-			u:
-				_id: fromId
-				username: Meteor.user().username
-
-		return true
+		RocketChat.addUserToRoom Meteor.userId(), data
diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 2e3f304c4a0c..50f3df9849f8 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -1,55 +1,73 @@
-Meteor.methods
-	sendMessage: (message) ->
-		if not Meteor.userId()
-			throw new Meteor.Error('invalid-user', "[methods] sendMessage -> Invalid user")
+RocketChat.sendMessage = (userId, message) ->
+	room = Meteor.call 'canAccessRoom', message.rid, userId
 
-		room = Meteor.call 'canAccessRoom', message.rid, Meteor.userId()
+	if not room
+		return false
 
-		if not room
-			return false
+	console.log '[methods] sendMessage -> '.green, 'userId:', userId, 'arguments:', arguments
 
-		console.log '[methods] sendMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+	message.ts = new Date()
 
-		message.ts = new Date()
+	message.u = Meteor.users.findOne userId, fields: username: 1
 
-		message.u = Meteor.users.findOne Meteor.userId(), fields: username: 1
+	if urls = message.msg.match /([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]+)?\??([-\+=&!:;%@\/\.\,\w]+)?#?([\w]+)?)?/g
+		message.urls = urls.map (url) -> url: url
 
-		if urls = message.msg.match /([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]+)?\??([-\+=&!:;%@\/\.\,\w]+)?#?([\w]+)?)?/g
-			message.urls = urls.map (url) -> url: url
+	message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
-		message = RocketChat.callbacks.run 'beforeSaveMessage', message
+	###
+	Defer other updated as their return is not interesting to the user
+	###
+	Meteor.defer ->
 
 		###
-		Defer other updated as their return is not interesting to the user
+		Update all the room activity tracker fields
 		###
-		Meteor.defer ->
-
+		ChatRoom.update
+			# only subscriptions to the same room
+			rid: message.rid
+		,
+			# update the last message timestamp
+			$set:
+				lm: message.ts
+			# increate the messages counter
+			$inc:
+				msgs: 1
+
+
+		# increment unread couter if direct messages
+		if room.t is 'd'
 			###
-			Update all the room activity tracker fields
+			Update the other subscriptions
 			###
-			ChatRoom.update
+			ChatSubscription.update
 				# only subscriptions to the same room
 				rid: message.rid
+				# not the msg owner
+				'u._id':
+					$ne: message.u._id
 			,
-				# update the last message timestamp
 				$set:
-					lm: message.ts
-				# increate the messages counter
+					# alert de user
+					alert: true
+					# open the room for the user
+					open: true
+				# increment unread couter
 				$inc:
-					msgs: 1
-
+					unread: 1
 
-			# increment unread couter if direct messages
-			if room.t is 'd'
+		else
+			message.mentions?.forEach (mention) ->
+				console.log mention
 				###
-				Update the other subscriptions
+				Update all other subscriptions of mentioned users to alert their owners and incrementing
+				the unread counter for mentions and direct messages
 				###
 				ChatSubscription.update
 					# only subscriptions to the same room
 					rid: message.rid
-					# not the msg owner
-					'u._id':
-						$ne: message.u._id
+					# the mentioned user
+					'u._id': mention._id
 				,
 					$set:
 						# alert de user
@@ -60,62 +78,47 @@ Meteor.methods
 					$inc:
 						unread: 1
 
-			else
-				message.mentions?.forEach (mention) ->
-					console.log mention
-					###
-					Update all other subscriptions of mentioned users to alert their owners and incrementing
-					the unread counter for mentions and direct messages
-					###
-					ChatSubscription.update
-						# only subscriptions to the same room
-						rid: message.rid
-						# the mentioned user
-						'u._id': mention._id
-					,
-						$set:
-							# alert de user
-							alert: true
-							# open the room for the user
-							open: true
-						# increment unread couter
-						$inc:
-							unread: 1
-
-			###
-			Update all other subscriptions to alert their owners but witout incrementing
-			the unread counter, as it is only for mentions and direct messages
-			###
-			ChatSubscription.update
-				# only subscriptions to the same room
-				rid: message.rid
-				# only the ones that have not been alerted yet
-				alert: false
-				# not the msg owner
-				'u._id':
-					$ne: message.u._id
-			,
-				$set:
-					# alert de user
-					alert: true
-					# open the room for the user
-					open: true
-			,
-				# make sure we alert all matching subscription
-				multi: true
-
 		###
-		Save the message. If there was already a typing record, update it.
+		Update all other subscriptions to alert their owners but witout incrementing
+		the unread counter, as it is only for mentions and direct messages
 		###
-		message._id = ChatMessage.insert message
+		ChatSubscription.update
+			# only subscriptions to the same room
+			rid: message.rid
+			# only the ones that have not been alerted yet
+			alert: false
+			# not the msg owner
+			'u._id':
+				$ne: message.u._id
+		,
+			$set:
+				# alert de user
+				alert: true
+				# open the room for the user
+				open: true
+		,
+			# make sure we alert all matching subscription
+			multi: true
+
+	###
+	Save the message. If there was already a typing record, update it.
+	###
+	message._id = ChatMessage.insert message
+
+	Meteor.defer ->
+		ChatMessage.remove
+			rid: message.rid
+			t: 't'
+			'u._id': message.u._id
+
+	Meteor.defer ->
+		RocketChat.callbacks.run 'afterSaveMessage', message
 
-		Meteor.defer ->
-			ChatMessage.remove
-				rid: message.rid
-				t: 't'
-				'u._id': message.u._id
 
-		Meteor.defer ->
-			RocketChat.callbacks.run 'afterSaveMessage', message
 
+Meteor.methods
+	sendMessage: (message) ->
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] sendMessage -> Invalid user")
 
+		RocketChat.sendMessage Meteor.userId(), message
\ No newline at end of file

From 8ab21427e789135e43753a8ea13c1ff739c24cf9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 23:44:46 -0300
Subject: [PATCH 30/33] Init hubot script loading

---
 packages/rocketchat-hubot/hubot.coffee | 72 ++++++++++---------
 server/methods/addUserToRoom.coffee    | 97 +++++++++++++-------------
 2 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/packages/rocketchat-hubot/hubot.coffee b/packages/rocketchat-hubot/hubot.coffee
index 67cd5e54dd84..3748ae5000f4 100644
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@@ -149,38 +149,44 @@ class RocketBotReceiver
 
 class HubotScripts
 	constructor: (robot) ->
-
-		# load all scripts in scripts/
-		scriptPath = path.resolve __dirname, 'scripts'
-		for file in fs.readdirSync(scriptPath)
-			continue unless /\.(coffee|js)$/.test(file)
-			robot.loadFile scriptPath, file
-
-		# load all scripts from hubot-scripts
-		scriptPath = path.resolve __dirname, 'node_modules', 'hubot-scripts', 'src', 'scripts'
-		scripts = require './hubot-scripts.json'
-		robot.loadHubotScripts scriptPath, scripts
-		robot.parseHelp path.join scriptPath, 'meme_captain.coffee'
-
-		# load all hubot-* modules from package.json
-		packageJson = require './package.json'
-		pkgs = (pkg for own pkg, version of packageJson.dependencies when !/^(coffee-script|hubot-scripts|hubot-help)$/.test(pkg))
-		pkgs.forEach (p) -> (require p)(robot)
-
-		# A special hack for hubot-help: ensure it replies via pm
-		privRobot = Object.create robot
-		privRobot.respond = (regex, cb) ->
-			robot.respond regex, (resp) ->
-				resp.message.private = true
-				cb(resp)
-		(require 'hubot-help')(privRobot)
-
-		# A special hack for meme_captain: change its "respond" invocations to "hear" so that it memes everywhere.
-		memecaptain = require './node_modules/hubot-scripts/src/scripts/meme_captain'
-		memecaptain
-			respond: (regex, cb) ->
-				robot.hear regex, (msg) ->
-					cb(msg) if msg.envelope.room is 'general/0' or /^\s*[@]?(rocket)?bot\b/i.test(msg.message.text)
+		hello = Npm.require 'hubot-scripts/src/scripts/hello.coffee'
+		hello robot
+
+		console.log Npm.require 'hubot-scripts/src/scripts'
+		# # load all scripts in scripts/
+		# console.log path.resolve '.'
+		# scriptPath = path.resolve __dirname, 'scripts'
+		# console.log scriptPath
+		# for file in fs.readdirSync(scriptPath)
+		# 	continue unless /\.(coffee|js)$/.test(file)
+		# 	robot.loadFile scriptPath, file
+
+		# return
+		# # load all scripts from hubot-scripts
+		# scriptPath = path.resolve __dirname, 'node_modules', 'hubot-scripts', 'src', 'scripts'
+		# scripts = require './hubot-scripts.json'
+		# robot.loadHubotScripts scriptPath, scripts
+		# robot.parseHelp path.join scriptPath, 'meme_captain.coffee'
+
+		# # load all hubot-* modules from package.json
+		# packageJson = require './package.json'
+		# pkgs = (pkg for own pkg, version of packageJson.dependencies when !/^(coffee-script|hubot-scripts|hubot-help)$/.test(pkg))
+		# pkgs.forEach (p) -> (require p)(robot)
+
+		# # A special hack for hubot-help: ensure it replies via pm
+		# privRobot = Object.create robot
+		# privRobot.respond = (regex, cb) ->
+		# 	robot.respond regex, (resp) ->
+		# 		resp.message.private = true
+		# 		cb(resp)
+		# (require 'hubot-help')(privRobot)
+
+		# # A special hack for meme_captain: change its "respond" invocations to "hear" so that it memes everywhere.
+		# memecaptain = require './node_modules/hubot-scripts/src/scripts/meme_captain'
+		# memecaptain
+		# 	respond: (regex, cb) ->
+		# 		robot.hear regex, (msg) ->
+		# 			cb(msg) if msg.envelope.room is 'general/0' or /^\s*[@]?(rocket)?bot\b/i.test(msg.message.text)
 
 sendHelper = Meteor.bindEnvironment (robot, envelope, strings, map) ->
 	while strings.length > 0
@@ -197,7 +203,7 @@ sendHelper = Meteor.bindEnvironment (robot, envelope, strings, map) ->
 RocketBot = new Robot null, null, false, 'rocketbot'
 RocketBot.alias = 'bot'
 RocketBot.adapter = new RocketChatAdapter RocketBot
-# HubotScripts(RocketBot)
+HubotScripts(RocketBot)
 
 RocketBot.hear /test/i, (res) ->
 	res.send "Test? TESTING? WE DON'T NEED NO TEST, EVERYTHING WORKS!"
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
index bed32aed1379..06e8a2d92fa9 100644
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@@ -1,52 +1,49 @@
-RocketChat.addUserToRoom = (userId, data) ->
-	fromId = userId
-	# console.log '[methods] addUserToRoom -> '.green, 'fromId:', fromId, 'data:', data
-
-	room = ChatRoom.findOne data.rid
-
-	# if room.username isnt Meteor.user().username and room.t is 'c'
-	if room.u.username isnt Meteor.users.findOne(userId).username and room.t is 'c'
-		throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
-
-	# verify if user is already in room
-	if room.usernames.indexOf(data.username) isnt -1
-		return
-
-	now = new Date()
-
-	update =
-		$push:
-			usernames:
-				$each: [data.username]
-				$sort: 1
-
-	newUser = Meteor.users.findOne username: data.username
-
-	ChatRoom.update data.rid, update
-
-	ChatSubscription.insert
-		rid: data.rid
-		ts: now
-		name: room.name
-		t: room.t
-		open: true
-		alert: true
-		unread: 1
-		u:
-			_id: newUser._id
-			username: data.username
-
-	ChatMessage.insert
-		rid: data.rid
-		ts: now
-		t: 'au'
-		msg: newUser.name
-		u:
-			_id: fromId
-			username: Meteor.users.findOne(userId).username
-
-	return true
-
 Meteor.methods
 	addUserToRoom: (data) ->
-		RocketChat.addUserToRoom Meteor.userId(), data
+		fromId = Meteor.userId()
+		# console.log '[methods] addUserToRoom -> '.green, 'fromId:', fromId, 'data:', data
+
+		room = ChatRoom.findOne data.rid
+
+		# if room.username isnt Meteor.user().username and room.t is 'c'
+		if room.u.username isnt Meteor.user().username and room.t is 'c'
+			throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
+
+		# verify if user is already in room
+		if room.usernames.indexOf(data.username) isnt -1
+			return
+
+		now = new Date()
+
+		update =
+			$push:
+				usernames:
+					$each: [data.username]
+					$sort: 1
+
+		newUser = Meteor.users.findOne username: data.username
+
+		ChatRoom.update data.rid, update
+
+		ChatSubscription.insert
+			rid: data.rid
+			ts: now
+			name: room.name
+			t: room.t
+			open: true
+			alert: true
+			unread: 1
+			u:
+				_id: newUser._id
+				username: data.username
+
+		ChatMessage.insert
+			rid: data.rid
+			ts: now
+			t: 'au'
+			msg: newUser.name
+			u:
+				_id: fromId
+				username: Meteor.user().username
+
+		return true

From a6d826a37926c033fdda584d6c67fd7659acdb47 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 26 Jun 2015 23:53:22 -0300
Subject: [PATCH 31/33] Fix!

---
 packages/rocketchat-hubot/hubot.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/rocketchat-hubot/hubot.coffee b/packages/rocketchat-hubot/hubot.coffee
index 3748ae5000f4..e9b3d8af6b2a 100644
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@@ -151,8 +151,6 @@ class HubotScripts
 	constructor: (robot) ->
 		hello = Npm.require 'hubot-scripts/src/scripts/hello.coffee'
 		hello robot
-
-		console.log Npm.require 'hubot-scripts/src/scripts'
 		# # load all scripts in scripts/
 		# console.log path.resolve '.'
 		# scriptPath = path.resolve __dirname, 'scripts'

From 73ea68cd47a23ac2ed8e9806fa79ae1c8da615b6 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Sat, 27 Jun 2015 03:00:00 -0300
Subject: [PATCH 32/33] Embedded RocketBot in ALL ROOMS

---
 .meteor/packages                              |  1 -
 .meteor/versions                              |  1 -
 client/methods/sendMessage.coffee             | 16 +----
 client/methods/typingStatus.coffee            |  2 -
 packages/rocketchat-hubot/hubot.coffee        | 38 +++-------
 packages/rocketchat-lib/lib/settings.coffee   | 32 +++++++++
 packages/rocketchat-lib/package.js            |  1 +
 .../rocketchat-lib/server}/sendMessage.coffee | 71 ++++++++++---------
 server/methods/canAccessRoom.coffee           |  4 +-
 server/startup/indexes.coffee                 |  1 +
 10 files changed, 88 insertions(+), 79 deletions(-)
 create mode 100644 packages/rocketchat-lib/lib/settings.coffee
 rename {server/methods => packages/rocketchat-lib/server}/sendMessage.coffee (75%)

diff --git a/.meteor/packages b/.meteor/packages
index f2522731adde..b626ea4eb9ab 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -13,7 +13,6 @@ email
 http
 jquery
 less
-markdown
 meteor-platform
 reactive-var
 service-configuration
diff --git a/.meteor/versions b/.meteor/versions
index 76f70953e44f..39488704f2ae 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -58,7 +58,6 @@ less@1.0.14
 livedata@1.0.13
 localstorage@1.0.3
 logging@1.0.7
-markdown@1.0.4
 matb33:collection-hooks@0.7.13
 meteor@1.1.6
 meteor-developer@1.1.3
diff --git a/client/methods/sendMessage.coffee b/client/methods/sendMessage.coffee
index 89f7a22dc73c..2dc78eeb8f75 100644
--- a/client/methods/sendMessage.coffee
+++ b/client/methods/sendMessage.coffee
@@ -3,24 +3,14 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 203, t('User_logged_out')
 
-		Tracker.nonreactive ->
+		if _.trim(message.msg) isnt ''
 
 			message.ts = new Date(Date.now() + TimeSync.serverOffset())
+
 			message.u =
 				_id: Meteor.userId()
 				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/gm, '<br/>'
 
-			ChatMessage.upsert
-				rid: message.rid
-				t: 't'
-			,
-				$set: message
-				$unset:
-					t: 1
-					expireAt: 1
+			ChatMessage.insert message
diff --git a/client/methods/typingStatus.coffee b/client/methods/typingStatus.coffee
index d1fe2c1af14e..2ff27da7c76f 100644
--- a/client/methods/typingStatus.coffee
+++ b/client/methods/typingStatus.coffee
@@ -11,8 +11,6 @@ Meteor.methods
 		if start
 
 			msgData =
-				'$set':
-					expireAt: moment().add(30, 'seconds').toDate()
 				'$setOnInsert':
 					msg: '...'
 					'u._id': Meteor.userId()
diff --git a/packages/rocketchat-hubot/hubot.coffee b/packages/rocketchat-hubot/hubot.coffee
index e9b3d8af6b2a..ab485e283bc6 100644
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@@ -12,8 +12,6 @@ path = Npm.require('path')
 # Log messages?
 DEBUG = true
 
-rocketUser = Meteor.users.findOne({username: 'rocketbot'})
-
 # Monkey-patch Hubot to support private messages
 Hubot.Response::priv = (strings...) ->
 	@robot.adapter.priv @envelope, strings...
@@ -36,6 +34,7 @@ class Robot extends Hubot.Robot
 		@topic = bind @topic
 		@error = bind @error
 		@catchAll = bind @catchAll
+		@user = Meteor.users.findOne {username: @name}, fields: username: 1
 	loadAdapter: -> false
 	hear:    (regex, callback) -> super regex, Meteor.bindEnvironment callback
 	respond: (regex, callback) -> super regex, Meteor.bindEnvironment callback
@@ -55,13 +54,8 @@ class RocketChatAdapter extends Hubot.Adapter
 	send: (envelope, strings...) ->
 		console.log envelope, strings
 		sendHelper @robot, envelope, strings, (string) =>
-			console.log "send #{envelope.user.rid}: #{string} (#{envelope.user.id})" if DEBUG
-			return @priv envelope, string if envelope.message.private
-			RocketChat.sendMessage rocketUser._id,
-				u:
-					username: "rocketbot"
-				msg: string
-				rid: envelope.user.rid
+			console.log "send #{envelope.room}: #{string} (#{envelope.user.id})" if DEBUG
+			RocketChat.sendMessage RocketBot.user, { msg: string }, { _id: envelope.room }
 
 	# Public: Raw method for sending emote data back to the chat source.
 	#
@@ -74,8 +68,6 @@ class RocketChatAdapter extends Hubot.Adapter
 			console.log "emote #{envelope.rid}: #{string} (#{envelope.u.username})" if DEBUG
 			return @priv envelope, "*** #{string} ***" if envelope.message.private
 			Meteor.call "sendMessage",
-				u:
-					username: "rocketbot"
 				msg: string
 				rid: envelope.rid
 				action: true
@@ -83,13 +75,13 @@ class RocketChatAdapter extends Hubot.Adapter
 	# Priv: our extension -- send a PM to user
 	priv: (envelope, strings...) ->
 		sendHelper @robot, envelope, strings, (string) ->
-			console.log "priv #{envelope.user.rid}: #{string} (#{envelope.user.id})" if DEBUG
+			console.log "priv #{envelope.room}: #{string} (#{envelope.user.id})" if DEBUG
 			Meteor.call "sendMessage",
 				u:
 					username: "rocketbot"
 				to: "#{envelope.user.id}"
 				msg: string
-				rid: envelope.user.rid
+				rid: envelope.room
 
 	# Public: Raw method for building a reply and sending it back to the chat
 	# source. Extend this.
@@ -133,24 +125,16 @@ class RocketChatAdapter extends Hubot.Adapter
 
 class RocketBotReceiver
 	constructor: (message) ->
-		if message.u.username is 'rocketbot'
-			return message
-
-		RocketBotUser = new Hubot.User(message.u.username, rid: message.rid)
-		RocketBotTextMessage = new Hubot.TextMessage(RocketBotUser, message.msg, message._id)
-
-		console.log {rid: message.rid, username:message.u.username}
-		# RocketChat.addUserToRoom rocketUser._id, {rid: message.rid, username:message.u.username}
-
-		RocketBot.adapter.receive RocketBotTextMessage
-		# console.log 'message: ', message if DEBUG
-		# console.log 'RocketBot: ', RocketBot if DEBUG
+		if message.u.username isnt RocketBot.name
+			RocketBotUser = new Hubot.User(message.u.username, room: message.rid)
+			RocketBotTextMessage = new Hubot.TextMessage(RocketBotUser, message.msg, message._id)
+			RocketBot.adapter.receive RocketBotTextMessage
 		return message
 
 class HubotScripts
 	constructor: (robot) ->
-		hello = Npm.require 'hubot-scripts/src/scripts/hello.coffee'
-		hello robot
+		Npm.require('hubot-scripts/src/scripts/hello.coffee')(robot)
+
 		# # load all scripts in scripts/
 		# console.log path.resolve '.'
 		# scriptPath = path.resolve __dirname, 'scripts'
diff --git a/packages/rocketchat-lib/lib/settings.coffee b/packages/rocketchat-lib/lib/settings.coffee
new file mode 100644
index 000000000000..92a79a31a70e
--- /dev/null
+++ b/packages/rocketchat-lib/lib/settings.coffee
@@ -0,0 +1,32 @@
+###
+# Setting hooks provide an easy way to add extra steps to common operations.
+# @namespace RocketChat.settings
+###
+RocketChat.settings = {}
+
+###
+# Setting priorities
+###
+RocketChat.settings.priority =
+	HIGH: -1000
+	MEDIUM: 0
+	LOW: 1000
+
+###
+# Add a setting function to a hook
+# @param {String} hook - The name of the hook
+# @param {Function} setting - The setting function
+###
+
+RocketChat.settings.add = (hook, setting, priority) ->
+	# if setting array doesn't exist yet, initialize it
+	priority ?= RocketChat.settings.priority.MEDIUM
+	unless _.isNumber priority
+		priority = RocketChat.settings.priority.MEDIUM
+	setting.priority = priority
+	RocketChat.settings[hook] ?= []
+	RocketChat.settings[hook].push setting
+	return
+
+RocketChat.settings.startup = (hook, setting, priority) ->
+	return
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index d75f01631ffb..d4aac90b7f72 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -17,6 +17,7 @@ Package.onUse(function(api) {
 	api.addFiles('lib/underscore.string.coffee', ['server', 'client']);
 	api.addFiles('lib/core.coffee', ['server', 'client']);
 	api.addFiles('lib/callbacks.coffee', ['server', 'client']);
+	api.addFiles('server/sendMessage.coffee', ['server']);
 
 	api.export(['RocketChat'], ['server', 'client']);
 });
diff --git a/server/methods/sendMessage.coffee b/packages/rocketchat-lib/server/sendMessage.coffee
similarity index 75%
rename from server/methods/sendMessage.coffee
rename to packages/rocketchat-lib/server/sendMessage.coffee
index 50f3df9849f8..1bf60a76555a 100644
--- a/server/methods/sendMessage.coffee
+++ b/packages/rocketchat-lib/server/sendMessage.coffee
@@ -1,28 +1,49 @@
-RocketChat.sendMessage = (userId, message) ->
-	room = Meteor.call 'canAccessRoom', message.rid, userId
+RocketChat.sendMessage = (user, message, room) ->
 
-	if not room
+	if not user or not message or not room._id
 		return false
 
-	console.log '[methods] sendMessage -> '.green, 'userId:', userId, 'arguments:', arguments
+	console.log '[functions] RocketChat.sendMessage -> '.green, 'arguments:', arguments
 
 	message.ts = new Date()
 
-	message.u = Meteor.users.findOne userId, fields: username: 1
+	message.u = _.pick user, ['_id','username']
+
+	message.rid = room._id
 
 	if urls = message.msg.match /([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]+)?\??([-\+=&!:;%@\/\.\,\w]+)?#?([\w]+)?)?/g
 		message.urls = urls.map (url) -> url: url
 
 	message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
+	message._id = ChatMessage.insert message
+
+	###
+	Defer other updates as their return is not interesting to the user
+	###
+
 	###
-	Defer other updated as their return is not interesting to the user
+	Execute all callbacks
+	###
+	Meteor.defer ->
+
+		RocketChat.callbacks.run 'afterSaveMessage', message
+
+	###
+	Remove the typing record
+	###
+	Meteor.defer ->
+
+		ChatMessage.remove
+			rid: message.rid
+			t: 't'
+			'u._id': message.u._id
+
+	###
+	Update all the room activity tracker fields
 	###
 	Meteor.defer ->
 
-		###
-		Update all the room activity tracker fields
-		###
 		ChatRoom.update
 			# only subscriptions to the same room
 			rid: message.rid
@@ -34,15 +55,20 @@ RocketChat.sendMessage = (userId, message) ->
 			$inc:
 				msgs: 1
 
+	###
+	Increment unread couter if direct messages
+	###
+	Meteor.defer ->
 
-		# increment unread couter if direct messages
-		if room.t is 'd'
+		if not room.t? or room.t is 'd'
 			###
 			Update the other subscriptions
 			###
 			ChatSubscription.update
 				# only subscriptions to the same room
 				rid: message.rid
+				# only direct messages subscriptions
+				t: 'd'
 				# not the msg owner
 				'u._id':
 					$ne: message.u._id
@@ -100,25 +126,4 @@ RocketChat.sendMessage = (userId, message) ->
 			# make sure we alert all matching subscription
 			multi: true
 
-	###
-	Save the message. If there was already a typing record, update it.
-	###
-	message._id = ChatMessage.insert message
-
-	Meteor.defer ->
-		ChatMessage.remove
-			rid: message.rid
-			t: 't'
-			'u._id': message.u._id
-
-	Meteor.defer ->
-		RocketChat.callbacks.run 'afterSaveMessage', message
-
-
-
-Meteor.methods
-	sendMessage: (message) ->
-		if not Meteor.userId()
-			throw new Meteor.Error('invalid-user', "[methods] sendMessage -> Invalid user")
-
-		RocketChat.sendMessage Meteor.userId(), message
\ No newline at end of file
+	return message
diff --git a/server/methods/canAccessRoom.coffee b/server/methods/canAccessRoom.coffee
index f2f4d19a4362..1b4a30f11292 100644
--- a/server/methods/canAccessRoom.coffee
+++ b/server/methods/canAccessRoom.coffee
@@ -10,7 +10,7 @@ Meteor.methods
 		unless rid
 			throw new Meteor.Error 'invalid-room', '[methods] canAccessRoom -> Cannot access empty room'
 
-		room = ChatRoom.findOne rid, { fields: { usernames: 1, t: 1 } }
+		room = ChatRoom.findOne rid, { fields: { usernames: 1, t: 1, name: 1 } }
 
 		if room.t is 'c'
 			canAccess = true
@@ -20,4 +20,4 @@ Meteor.methods
 		if canAccess isnt true
 			return false
 		else
-			return room
+			return _.pick room, ['_id', 't', 'name']
diff --git a/server/startup/indexes.coffee b/server/startup/indexes.coffee
index 696227f618eb..e58c9b75b442 100644
--- a/server/startup/indexes.coffee
+++ b/server/startup/indexes.coffee
@@ -11,4 +11,5 @@ Meteor.startup ->
 		try ChatSubscription._ensureIndex { 'ts': 1 } catch e then console.log e
 
 		try ChatMessage._ensureIndex { 'rid': 1, 'ts': 1 } catch e then console.log e
+		try ChatMessage._ensureIndex { 'rid': 1, 't': 1, 'u._id': 1 } catch e then console.log e
 		try ChatMessage._ensureIndex { 'expireAt': 1 }, { expireAfterSeconds: 0 } catch e then console.log e

From 58b337b0b0acca3c913f854b5c0c8d6b275b4b32 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Sat, 27 Jun 2015 03:00:04 -0300
Subject: [PATCH 33/33] Embedded RocketBot in ALL ROOMS

---
 server/methods/sendMessage.coffee | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 server/methods/sendMessage.coffee

diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
new file mode 100644
index 000000000000..0b803d8f2922
--- /dev/null
+++ b/server/methods/sendMessage.coffee
@@ -0,0 +1,16 @@
+Meteor.methods
+	sendMessage: (message) ->
+
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] sendMessage -> Invalid user")
+
+		console.log '[methods] sendMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+
+		user = Meteor.users.findOne Meteor.userId(), fields: username: 1
+
+		room = Meteor.call 'canAccessRoom', message.rid, user._id
+
+		if not room
+			return false
+
+		RocketChat.sendMessage user, message, room