Merge branch 'develop' into dependencies-update

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:8.9
+      - image: circleci/node:8.11
 
     steps:
       - checkout
@@ -135,7 +135,7 @@ jobs:
   test-with-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8.9-browsers
+      - image: circleci/node:8.11-browsers
       - image: mongo:4.0
         command: [mongod, --noprealloc, --smallfiles, --replSet=rs0]
 
@@ -182,7 +182,7 @@ jobs:
   test-without-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8.9-browsers
+      - image: circleci/node:8.11-browsers
       - image: circleci/mongo:4.0
 
     environment:
@@ -221,7 +221,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:8.9
+      - image: circleci/node:8.11
 
     steps:
       - attach_workspace:

README.md

@@ -1,6 +1,8 @@
-![Rocket.Chat logo](https://upload.wikimedia.org/wikipedia/commons/1/12/Rocket.Chat_Logo.svg)
+![](https://user-images.githubusercontent.com/551004/43643393-884b00a4-9701-11e8-94d8-14c46d1f3660.png)
 
-# The Ultimate Open Source WebChat Platform
+<h1 align="center">
+  The Ultimate Open Source WebChat Platform
+</h1>
 
 [![Rocket.Chat](https://open.rocket.chat/images/join-chat.svg)](https://open.rocket.chat/)
 [![Build Status](https://img.shields.io/travis/RocketChat/Rocket.Chat/master.svg)](https://travis-ci.org/RocketChat/Rocket.Chat)
@@ -87,17 +89,7 @@ Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron]
 
 # Mobile Apps
 
-## Native Mobile Apps
-*Note: currently the native apps doesn't support all the features that web does. If you're looking for it, you should download the Cordova apps.*
-
-[![Rocket.Chat on Apple App Store](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android)
-
-## Hybrid Mobile Apps (Cordova)
-
-[![Rocket.Chat on Apple App Store](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
-
-*Now compatible with all Android devices as old as version 4.0.x - [download here](https://rocket.chat/docs/developer-guides/mobile-apps/), even on BlackBerry Passport!*
-
+[![Rocket.Chat on Apple App Store](https://user-images.githubusercontent.com/551004/29770691-a2082ff4-8bc6-11e7-89a6-964cd405ea8e.png)](https://itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8) [![Rocket.Chat on Google Play](https://user-images.githubusercontent.com/551004/29770692-a20975c6-8bc6-11e7-8ab0-1cde275496e0.png)](https://play.google.com/store/apps/details?id=chat.rocket.android)  [![](https://user-images.githubusercontent.com/551004/48210349-50649480-e35e-11e8-97d9-74a4331faf3a.png)](https://f-droid.org/en/packages/chat.rocket.android/)
 
 # Deployment
 
@@ -331,9 +323,6 @@ It is a great solution for communities and companies wanting to privately host t
 - XMPP Support via [Webhook bridge](https://github.com/saqura/xmppwb) [Issue #404](https://github.com/RocketChat/Rocket.Chat/issues/404)
 - Federation via [matrix.org](https://www.matrix.org/), see [hubot-freddie](https://www.npmjs.com/package/hubot-freddie) and [Federation project](https://github.com/RocketChat/Rocket.Chat.Federation) : [Issue #520](https://github.com/RocketChat/Rocket.Chat/issues/520), [Issue #601](https://github.com/RocketChat/Rocket.Chat/issues/601)
 - Support for PostgreSQL: [Issue #533](https://github.com/RocketChat/Rocket.Chat/issues/533), [Issue #822](https://github.com/RocketChat/Rocket.Chat/pull/822)
-- Native iOS Application [Issue #270](https://github.com/RocketChat/Rocket.Chat/issues/270), [Rocket.Chat.iOS - HELP WANTED](https://github.com/RocketChat/Rocket.Chat.iOS)
-- Native Android Application [Issue #271 - HELP WANTED](https://github.com/RocketChat/Rocket.Chat/issues/271)
-- Off the Record Messaging [Issue #36](https://github.com/RocketChat/Rocket.Chat/issues/36), [Issue #268](https://github.com/RocketChat/Rocket.Chat/issues/268)
 - WordPress Plug-in [Issue # 1920](https://github.com/RocketChat/Rocket.Chat/issues/1920)
 - Integration with PSTN (Public Switched Telephone Networks)
 - API-enabled methods: [Issue #202](https://github.com/RocketChat/Rocket.Chat/issues/202), [Issue #454](https://github.com/RocketChat/Rocket.Chat/issues/454), [Issue #455](https://github.com/RocketChat/Rocket.Chat/issues/455), [Issue #759](https://github.com/RocketChat/Rocket.Chat/issues/759)

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

@@ -255,7 +255,8 @@ RocketChat.API.v1.addRoute('users.setAvatar', { authRequired: true }, {
 								if (!user) {
 									return callback(new Meteor.Error('error-invalid-user', 'The optional "userId" or "username" param provided does not match any users'));
 								}
-								if (!RocketChat.authz.hasPermission(this.userId, 'edit-other-user-info')) {
+								const isAnotherUser = this.userId !== user._id;
+								if (isAnotherUser && !RocketChat.authz.hasPermission(this.userId, 'edit-other-user-info')) {
 									return callback(new Meteor.Error('error-not-allowed', 'Not allowed'));
 								}
 							}

packages/rocketchat-channel-settings/client/index.js

@@ -0,0 +1,7 @@
+import './stylesheets/channel-settings.css';
+import './startup/messageTypes';
+import './startup/tabBar';
+import './startup/trackSettingsChange';
+import './lib/ChannelSettings';
+import './views/channelSettings.html';
+import './views/channelSettings';

packages/rocketchat-channel-settings/client/lib/ChannelSettings.js

@@ -1,5 +1,6 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 RocketChat.ChannelSettings = new class {

packages/rocketchat-channel-settings/client/startup/messageTypes.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 import s from 'underscore.string';
 
 Meteor.startup(function() {

packages/rocketchat-channel-settings/client/startup/tabBar.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(() => {
 	RocketChat.TabBar.addButton({

packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js

@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatRoom, RoomManager } from 'meteor/rocketchat:ui';
 
 Meteor.startup(function() {
 	const roomSettingsChangedCallback = (msg) => {

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -7,6 +7,7 @@ import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';
 import { call, erase, hide, leave, RocketChat, RoomSettingsEnum } from 'meteor/rocketchat:lib';
+import { modal, t, ChatRoom } from 'meteor/rocketchat:ui';
 
 const common = {
 	canLeaveRoom() {

packages/rocketchat-channel-settings/package.js

@@ -13,30 +13,6 @@ Package.onUse(function(api) {
 		'templating',
 		'rocketchat:lib',
 	]);
-
-	api.addFiles([
-		'client/lib/ChannelSettings.js',
-		'client/startup/messageTypes.js',
-		'client/startup/tabBar.js',
-		'client/startup/trackSettingsChange.js',
-		'client/views/channelSettings.html',
-		'client/views/channelSettings.js',
-		'client/stylesheets/channel-settings.css',
-	], 'client');
-
-	api.addFiles([
-		'server/functions/saveReactWhenReadOnly.js',
-		'server/functions/saveRoomType.js',
-		'server/functions/saveRoomTopic.js',
-		'server/functions/saveRoomCustomFields.js',
-		'server/functions/saveRoomAnnouncement.js',
-		'server/functions/saveRoomName.js',
-		'server/functions/saveRoomReadOnly.js',
-		'server/functions/saveRoomDescription.js',
-		'server/functions/saveRoomSystemMessages.js',
-		'server/methods/saveRoomSettings.js',
-		'server/models/Messages.js',
-		'server/models/Rooms.js',
-		'server/startup.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });

packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveReactWhenReadOnly = function(rid, allowReact) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomAnnouncement = function(rid, roomAnnouncement, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomCustomFields = function(rid, roomCustomFields) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomDescription = function(rid, roomDescription, user) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomName.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomName = function(rid, displayName, user, sendMessage = true) {
 	const room = RocketChat.models.Rooms.findOneById(rid);

packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomReadOnly = function(rid, readOnly) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomSystemMessages = function(rid, systemMessages) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomTopic = function(rid, roomTopic, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomType.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.saveRoomType = function(rid, roomType, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/index.js

@@ -0,0 +1,13 @@
+import './startup';
+import './models/Messages';
+import './models/Rooms';
+import './functions/saveReactWhenReadOnly';
+import './functions/saveRoomAnnouncement';
+import './functions/saveRoomCustomFields';
+import './functions/saveRoomDescription';
+import './functions/saveRoomName';
+import './functions/saveRoomReadOnly';
+import './functions/saveRoomSystemMessages';
+import './functions/saveRoomTopic';
+import './functions/saveRoomType';
+import './methods/saveRoomSettings';

packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 const fields = ['roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted'];
 Meteor.methods({

packages/rocketchat-channel-settings/server/models/Messages.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser = function(type, roomId, message, user, extraData) {
 	return this.createWithTypeRoomIdMessageAndUser(type, roomId, message, user, extraData);
 };

packages/rocketchat-channel-settings/server/models/Rooms.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Rooms.setDescriptionById = function(_id, description) {
 	const query = {
 		_id,

packages/rocketchat-channel-settings/server/startup.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.models.Permissions.upsert('post-readonly', { $setOnInsert: { roles: ['admin', 'owner', 'moderator'] } });

packages/rocketchat-cors/client/index.js

@@ -0,0 +1 @@
+import '../lib/common';

packages/rocketchat-cors/common.js → packages/rocketchat-cors/lib/common.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.settings.onload('Force_SSL', function(key, value) {

packages/rocketchat-cors/package.js

@@ -10,8 +10,9 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'webapp',
 		'mongo',
+		'rocketchat:lib',
 	]);
 
-	api.addFiles('cors.js', 'server');
-	api.addFiles('common.js');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });

packages/rocketchat-cors/cors.js → packages/rocketchat-cors/server/cors.js

@@ -1,11 +1,10 @@
-/* globals WebAppInternals */
 import { Meteor } from 'meteor/meteor';
-import { WebApp } from 'meteor/webapp';
-import _ from 'underscore';
+import { WebApp, WebAppInternals } from 'meteor/webapp';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { Mongo } from 'meteor/mongo';
 
+import _ from 'underscore';
 import url from 'url';
-
-import { Mongo } from 'meteor/mongo';
 import tls from 'tls';
 // FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316
 // TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853

packages/rocketchat-cors/server/index.js

@@ -0,0 +1,2 @@
+import '../lib/common';
+import './cors';