Merge pull request #2 from RocketChat/develop

local update

.editorconfig

@@ -8,7 +8,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,coffee,html,less,json}]
+[*.{js,coffee,html,less,css,json}]
 indent_style = tab
 
 [*.i18n.json]

.eslintrc

@@ -27,6 +27,7 @@
 		"no-delete-var": 2,
 		"no-dupe-keys": 2,
 		"no-dupe-args": 2,
+		"no-dupe-class-members": 2,
 		"no-duplicate-case": 2,
 		"no-empty": 2,
 		"no-empty-character-class": 2,
@@ -108,6 +109,7 @@
 		"EJSON"                       : false,
 		"Email"                       : false,
 		"FlowRouter"                  : false,
+		"FileUpload"                  : false,
 		"HTTP"                        : false,
 		"getNextAgent"                : false,
 		"handleError"                 : false,
@@ -131,7 +133,6 @@
 		"ReactiveVar"                 : false,
 		"RocketChat"                  : true,
 		"RocketChatFile"              : false,
-		"RocketChatFileAvatarInstance": false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
 		"s"                           : false,

.meteor/packages

@@ -12,7 +12,6 @@ accounts-password@1.3.6
 accounts-twitter@1.2.1
 blaze-html-templates
 check@1.2.5
-coffeescript@1.11.1_4
 ddp-rate-limiter@1.0.7
 ecmascript@0.7.3
 ejson@1.0.13
@@ -34,7 +33,6 @@ service-configuration@1.0.11
 session@1.1.7
 shell-server@0.2.3
 spacebars
-standard-minifier-css@1.3.4
 standard-minifier-js@2.0.0
 tracker@1.1.3
 
@@ -132,7 +130,7 @@ rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
 rocketchat:message-snippet
-rocketchat:google-natural-language
+#rocketchat:google-natural-language
 rocketchat:drupal
 rocketchat:monitoring
 #rocketchat:chatops
@@ -172,3 +170,4 @@ underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
+rocketchat:postcss

.meteor/versions

@@ -105,8 +105,6 @@ ordered-dict@1.0.9
 ostrio:cookies@2.2.1
 pauli:accounts-linkedin@2.1.2
 pauli:linkedin-oauth@1.1.0
-peerlibrary:aws-sdk@2.4.9_1
-peerlibrary:blocking@0.5.2
 percolate:synced-cron@1.3.2
 promise@0.8.8
 raix:eventemitter@0.1.3
@@ -148,7 +146,6 @@ rocketchat:file@0.0.1
 rocketchat:file-upload@0.0.1
 rocketchat:github-enterprise@0.0.1
 rocketchat:gitlab@0.0.1
-rocketchat:google-natural-language@0.0.1
 rocketchat:highlight-words@0.0.1
 rocketchat:i18n@0.0.1
 rocketchat:iframe-login@1.0.0
@@ -183,6 +180,7 @@ rocketchat:oauth2-server@2.0.0
 rocketchat:oauth2-server-config@1.0.0
 rocketchat:oembed@0.0.1
 rocketchat:otr@0.0.1
+rocketchat:postcss@1.0.0
 rocketchat:push-notifications@0.0.1
 rocketchat:reactions@0.0.1
 rocketchat:sandstorm@0.0.1
@@ -232,7 +230,6 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.2
 srp@1.0.10
-standard-minifier-css@1.3.4
 standard-minifier-js@2.0.0
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2

.postcssrc

@@ -0,0 +1,20 @@
+{
+	"plugins": {
+		"postcss-smart-import": {},
+		"postcss-cssnext": {
+			"browsers": [
+				"ie > 10",
+				"last 2 Edge versions",
+				"last 2 Firefox versions",
+				"last 1 FirefoxAndroid versions",
+				"last 2 Chrome versions",
+				"last 1 ChromeAndroid versions",
+				"last 2 Safari versions",
+				"last 2 Opera versions",
+				"last 2 iOS versions",
+				"last 1 Android version"
+			]
+		}
+	},
+	"excludedPackages": ["deepwell:bootstrap-datepicker2", "smoral:sweetalert"]
+}

.stylelintignore

@@ -0,0 +1,2 @@
+packages/rocketchat-theme/client/vendor/fontello/css/fontello.css
+packages/meteor-autocomplete/client/autocomplete.css

.travis/setartname.sh

@@ -1,6 +1,6 @@
-if [[ $TRAVIS_BRANCH ]]
+if [[ $TRAVIS_TAG ]]
  then
-  export ARTIFACT_NAME="$(meteor npm run version --silent).$TRAVIS_BUILD_NUMBER"
-else
   export ARTIFACT_NAME="$(meteor npm run version --silent)"
+else
+  export ARTIFACT_NAME="$(meteor npm run version --silent).$TRAVIS_BUILD_NUMBER"
 fi

HISTORY.md

@@ -1,4 +1,10 @@
 <a name="0.56.0"></a>
+# NEXT
+
+### Breaking Changes
+
+- [#7095](https://github.com/RocketChat/Rocket.Chat/pull/7095) Internal hubot does not load [hubot-scripts](https://github.com/github/hubot-scripts) anymore.
+
 # 0.56.0 (2017-05-15)
 
 ### New Features
@@ -51,7 +57,7 @@
 - [#6780](https://github.com/RocketChat/Rocket.Chat/pull/6780) Convert Mailer Package to Js
 - [#6694](https://github.com/RocketChat/Rocket.Chat/pull/6694) Convert markdown to js
 - [#6689](https://github.com/RocketChat/Rocket.Chat/pull/6689) Convert Mentions-Flextab Package to Js
-- [#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781) Convert Message-Star Package to js 
+- [#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781) Convert Message-Star Package to js
 - [#6688](https://github.com/RocketChat/Rocket.Chat/pull/6688) Convert Oembed Package to Js
 - [#6672](https://github.com/RocketChat/Rocket.Chat/pull/6672) Converted rocketchat-lib 3
 - [#6654](https://github.com/RocketChat/Rocket.Chat/pull/6654) disable proxy configuration
@@ -168,7 +174,7 @@
 - [#6780](https://github.com/RocketChat/Rocket.Chat/pull/6780) Convert Mailer Package to Js
 - [#6694](https://github.com/RocketChat/Rocket.Chat/pull/6694) Convert markdown to js
 - [#6689](https://github.com/RocketChat/Rocket.Chat/pull/6689) Convert Mentions-Flextab Package to Js
-- [#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781) Convert Message-Star Package to js 
+- [#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781) Convert Message-Star Package to js
 - [#6688](https://github.com/RocketChat/Rocket.Chat/pull/6688) Convert Oembed Package to Js
 - [#6672](https://github.com/RocketChat/Rocket.Chat/pull/6672) Converted rocketchat-lib 3
 - [#6654](https://github.com/RocketChat/Rocket.Chat/pull/6654) disable proxy configuration

client/notifications/UsersNameChanged.js

@@ -10,6 +10,18 @@ Meteor.startup(function() {
 			multi: true
 		});
 
+		RocketChat.models.Messages.update({
+			mentions: {
+				$elemMatch: { _id }
+			}
+		}, {
+			$set: {
+				'mentions.$.name': name
+			}
+		}, {
+			multi: true
+		});
+
 		RocketChat.models.Subscriptions.update({
 			name: username,
 			t: 'd'

example-build.sh

@@ -5,7 +5,7 @@ IFS=$'\n\t'
 
 # Build
 export NODE_ENV=production
-meteor add rocketchat:internal-hubot meteorhacks:kadira
+meteor add rocketchat:internal-hubot
 meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
 
 # Run

package.json

@@ -46,7 +46,7 @@
 		"start": "meteor npm i && meteor",
 		"lint": "eslint .",
 		"lint-fix": "eslint . --fix",
-		"stylelint": "stylelint **/*.less",
+		"stylelint": "stylelint packages/**/*.{less,css}",
 		"test": "node .scripts/start.js",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
@@ -74,15 +74,19 @@
 		"chimp": "^0.49.0",
 		"conventional-changelog": "^1.1.3",
 		"eslint": "^3.19.0",
+		"postcss-cssnext": "^2.11.0",
+		"postcss-smart-import": "^0.7.2",
 		"stylelint": "^7.10.1",
 		"supertest": "^3.0.0"
 	},
 	"dependencies": {
+		"@google-cloud/storage": "^1.1.1",
+		"aws-sdk": "^2.55.0",
 		"babel-runtime": "^6.23.0",
 		"bcrypt": "^1.0.2",
-		"codemirror": "^5.25.2",
+		"codemirror": "^5.26.0",
 		"file-type": "^4.3.0",
-		"highlight.js": "^9.11.0",
+		"highlight.js": "^9.12.0",
 		"jquery": "^3.2.1",
 		"mime-db": "^1.28.0",
 		"mime-type": "^3.0.5",

packages/rocketchat-api/server/api.js

@@ -104,7 +104,7 @@ class API extends Restivus {
 						try {
 							result = originalAction.apply(this);
 						} catch (e) {
-							this.logger.debug(`${ method } ${ route } threw an error:`, e);
+							this.logger.debug(`${ method } ${ route } threw an error:`, e.stack);
 							return RocketChat.API.v1.failure(e.message, e.error);
 						}
 

packages/rocketchat-api/server/v1/chat.js

@@ -28,6 +28,28 @@ RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, {
 	}
 });
 
+RocketChat.API.v1.addRoute('chat.getMessage', { authRequired: true }, {
+	get() {
+		if (!this.queryParams.msgId) {
+			return RocketChat.API.v1.failure('The "msgId" query parameter must be provided.');
+		}
+
+
+		let msg;
+		Meteor.runAsUser(this.userId, () => {
+			msg = Meteor.call('getSingleMessage', this.queryParams.msgId);
+		});
+
+		if (!msg) {
+			return RocketChat.API.v1.failure();
+		}
+
+		return RocketChat.API.v1.success({
+			message: msg
+		});
+	}
+});
+
 RocketChat.API.v1.addRoute('chat.postMessage', { authRequired: true }, {
 	post() {
 		const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0];