From 7c7b063cae6a0141763686f89974cb679b04c801 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Fri, 1 Feb 2019 15:00:28 -0200 Subject: [PATCH 1/5] Remove dependency of RC namespace in rc-mapview --- packages/rocketchat-mapview/client/mapview.js | 7 ++++--- packages/rocketchat-mapview/package.js | 3 ++- packages/rocketchat-mapview/server/settings.js | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/rocketchat-mapview/client/mapview.js b/packages/rocketchat-mapview/client/mapview.js index bd6efc7962bfc..1689f77f445e4 100644 --- a/packages/rocketchat-mapview/client/mapview.js +++ b/packages/rocketchat-mapview/client/mapview.js @@ -1,5 +1,6 @@ import { TAPi18n } from 'meteor/tap:i18n'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { settings } from 'meteor/rocketchat:settings'; +import { callbacks } from 'meteor/rocketchat:callbacks'; /* * MapView is a named function that will replace geolocation in messages with a Google Static Map * @param {Object} message - The message object @@ -8,7 +9,7 @@ import { RocketChat } from 'meteor/rocketchat:lib'; function MapView(message) { // get MapView settings - const mv_googlekey = RocketChat.settings.get('MapView_GMapsAPIKey'); + const mv_googlekey = settings.get('MapView_GMapsAPIKey'); if (message.location) { @@ -26,4 +27,4 @@ function MapView(message) { return message; } -RocketChat.callbacks.add('renderMessage', MapView, RocketChat.callbacks.priority.HIGH, 'mapview'); +callbacks.add('renderMessage', MapView, callbacks.priority.HIGH, 'mapview'); diff --git a/packages/rocketchat-mapview/package.js b/packages/rocketchat-mapview/package.js index a1f7f3b204ac6..167cf84cd90c9 100644 --- a/packages/rocketchat-mapview/package.js +++ b/packages/rocketchat-mapview/package.js @@ -7,7 +7,8 @@ Package.describe({ Package.onUse(function(api) { api.use([ 'ecmascript', - 'rocketchat:lib', + 'rocketchat:settings', + 'rocketchat:callbacks', 'tap:i18n', ]); api.mainModule('client/index.js', 'client'); diff --git a/packages/rocketchat-mapview/server/settings.js b/packages/rocketchat-mapview/server/settings.js index 56dd471591dfb..1e592d8892a13 100644 --- a/packages/rocketchat-mapview/server/settings.js +++ b/packages/rocketchat-mapview/server/settings.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { settings } from 'meteor/rocketchat:settings'; Meteor.startup(function() { - RocketChat.settings.add('MapView_Enabled', false, { type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description' }); - return RocketChat.settings.add('MapView_GMapsAPIKey', '', { type: 'string', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_GMapsAPIKey', i18nDescription: 'MapView_GMapsAPIKey_Description' }); + settings.add('MapView_Enabled', false, { type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description' }); + return settings.add('MapView_GMapsAPIKey', '', { type: 'string', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_GMapsAPIKey', i18nDescription: 'MapView_GMapsAPIKey_Description' }); }); From e08ad7e81d5861048666b4119cfac2d5735bc262 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Fri, 1 Feb 2019 15:00:56 -0200 Subject: [PATCH 2/5] Remove dependency of RC namespace in rc-mentions --- packages/rocketchat-mentions/client/client.js | 11 ++++++----- packages/rocketchat-mentions/package.js | 5 ++++- .../methods/getUserMentionsByChannel.js | 8 ++++---- packages/rocketchat-mentions/server/server.js | 19 +++++++++++-------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/packages/rocketchat-mentions/client/client.js b/packages/rocketchat-mentions/client/client.js index 2f06f367447fd..efec44bd93109 100644 --- a/packages/rocketchat-mentions/client/client.js +++ b/packages/rocketchat-mentions/client/client.js @@ -1,13 +1,14 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { callbacks } from 'meteor/rocketchat:callbacks'; +import { settings } from 'meteor/rocketchat:settings'; import Mentions from '../lib/Mentions'; const MentionsClient = new Mentions({ pattern() { - return RocketChat.settings.get('UTF8_Names_Validation'); + return settings.get('UTF8_Names_Validation'); }, useRealName() { - return RocketChat.settings.get('UI_Use_Real_Name'); + return settings.get('UI_Use_Real_Name'); }, me() { const me = Meteor.user(); @@ -15,5 +16,5 @@ const MentionsClient = new Mentions({ }, }); -RocketChat.callbacks.add('renderMessage', (message) => MentionsClient.parse(message), RocketChat.callbacks.priority.MEDIUM, 'mentions-message'); -RocketChat.callbacks.add('renderMentions', (message) => MentionsClient.parse(message), RocketChat.callbacks.priority.MEDIUM, 'mentions-mentions'); +callbacks.add('renderMessage', (message) => MentionsClient.parse(message), callbacks.priority.MEDIUM, 'mentions-message'); +callbacks.add('renderMentions', (message) => MentionsClient.parse(message), callbacks.priority.MEDIUM, 'mentions-mentions'); diff --git a/packages/rocketchat-mentions/package.js b/packages/rocketchat-mentions/package.js index 96cf55b02a1b7..34a31e101339f 100644 --- a/packages/rocketchat-mentions/package.js +++ b/packages/rocketchat-mentions/package.js @@ -8,7 +8,10 @@ Package.describe({ Package.onUse(function(api) { api.use([ 'ecmascript', - 'rocketchat:lib', + 'rocketchat:settings', + 'rocketchat:callbacks', + 'rocketchat:notifications', + 'rocketchat:models', ]); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); diff --git a/packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js b/packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js index ac1b002ba0d44..01d28687ce0d2 100644 --- a/packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js +++ b/packages/rocketchat-mentions/server/methods/getUserMentionsByChannel.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { Rooms, Users, Messages } from 'meteor/rocketchat:models'; Meteor.methods({ getUserMentionsByChannel({ roomId, options }) { @@ -10,14 +10,14 @@ Meteor.methods({ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getUserMentionsByChannel' }); } - const room = RocketChat.models.Rooms.findOneById(roomId); + const room = Rooms.findOneById(roomId); if (!room) { throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getUserMentionsByChannel' }); } - const user = RocketChat.models.Users.findOneById(Meteor.userId()); + const user = Users.findOneById(Meteor.userId()); - return RocketChat.models.Messages.findVisibleByMentionAndRoomId(user.username, roomId, options).fetch(); + return Messages.findVisibleByMentionAndRoomId(user.username, roomId, options).fetch(); }, }); diff --git a/packages/rocketchat-mentions/server/server.js b/packages/rocketchat-mentions/server/server.js index 0babdb13cc468..4fdf6556ef8b8 100644 --- a/packages/rocketchat-mentions/server/server.js +++ b/packages/rocketchat-mentions/server/server.js @@ -1,23 +1,26 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { settings } from 'meteor/rocketchat:settings'; +import { callbacks } from 'meteor/rocketchat:callbacks'; +import { Notifications } from 'meteor/rocketchat:notifications'; +import { Users, Subscriptions, Rooms } from 'meteor/rocketchat:models'; import _ from 'underscore'; import MentionsServer from './Mentions'; const mention = new MentionsServer({ - pattern: () => RocketChat.settings.get('UTF8_Names_Validation'), - messageMaxAll: () => RocketChat.settings.get('Message_MaxAll'), + pattern: () => settings.get('UTF8_Names_Validation'), + messageMaxAll: () => settings.get('Message_MaxAll'), getUsers: (usernames) => Meteor.users.find({ username: { $in: _.unique(usernames) } }, { fields: { _id: true, username: true, name: 1 } }).fetch(), - getUser: (userId) => RocketChat.models.Users.findOneById(userId), - getTotalChannelMembers: (rid) => RocketChat.models.Subscriptions.findByRoomId(rid).count(), - getChannels: (channels) => RocketChat.models.Rooms.find({ name: { $in: _.unique(channels) }, t: 'c' }, { fields: { _id: 1, name: 1 } }).fetch(), + getUser: (userId) => Users.findOneById(userId), + getTotalChannelMembers: (rid) => Subscriptions.findByRoomId(rid).count(), + getChannels: (channels) => Rooms.find({ name: { $in: _.unique(channels) }, t: 'c' }, { fields: { _id: 1, name: 1 } }).fetch(), onMaxRoomMembersExceeded({ sender, rid }) { // Get the language of the user for the error notification. const { language } = this.getUser(sender._id); const msg = TAPi18n.__('Group_mentions_disabled_x_members', { total: this.messageMaxAll }, language); - RocketChat.Notifications.notifyUser(sender._id, 'message', { + Notifications.notifyUser(sender._id, 'message', { _id: Random.id(), rid, ts: new Date, @@ -32,4 +35,4 @@ const mention = new MentionsServer({ }); }, }); -RocketChat.callbacks.add('beforeSaveMessage', (message) => mention.execute(message), RocketChat.callbacks.priority.HIGH, 'mentions'); +callbacks.add('beforeSaveMessage', (message) => mention.execute(message), callbacks.priority.HIGH, 'mentions'); From 8bb2a9628a521d8547d3214ac1ec7eff5702a67e Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Fri, 1 Feb 2019 15:16:42 -0200 Subject: [PATCH 3/5] Remove dependency of RC namespace in rc-mentions-flextab --- packages/rocketchat-mentions-flextab/client/actionButton.js | 5 ++--- packages/rocketchat-mentions-flextab/client/tabBar.js | 4 ++-- packages/rocketchat-mentions-flextab/package.js | 3 ++- .../server/publications/mentionedMessages.js | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js index 58fd25e89e164..f47380e6d6444 100644 --- a/packages/rocketchat-mentions-flextab/client/actionButton.js +++ b/packages/rocketchat-mentions-flextab/client/actionButton.js @@ -1,10 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { RocketChat } from 'meteor/rocketchat:lib'; -import { RoomHistoryManager } from 'meteor/rocketchat:ui'; +import { MessageAction, RoomHistoryManager } from 'meteor/rocketchat:ui-utils'; Meteor.startup(function() { - RocketChat.MessageAction.addButton({ + MessageAction.addButton({ id: 'jump-to-message', icon: 'jump', label: 'Jump_to_message', diff --git a/packages/rocketchat-mentions-flextab/client/tabBar.js b/packages/rocketchat-mentions-flextab/client/tabBar.js index e1b25e8c59bae..768da54e5998a 100644 --- a/packages/rocketchat-mentions-flextab/client/tabBar.js +++ b/packages/rocketchat-mentions-flextab/client/tabBar.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { TabBar } from 'meteor/rocketchat:ui-utils'; Meteor.startup(function() { - return RocketChat.TabBar.addButton({ + return TabBar.addButton({ groups: ['channel', 'group'], id: 'mentions', i18nTitle: 'Mentions', diff --git a/packages/rocketchat-mentions-flextab/package.js b/packages/rocketchat-mentions-flextab/package.js index 726ce88376b1b..898b199363292 100644 --- a/packages/rocketchat-mentions-flextab/package.js +++ b/packages/rocketchat-mentions-flextab/package.js @@ -10,7 +10,8 @@ Package.onUse(function(api) { 'mongo', 'ecmascript', 'less', - 'rocketchat:lib', + 'rocketchat:models', + 'rocketchat:ui-utils', 'templating', ]); api.addFiles('client/views/stylesheets/mentionsFlexTab.less', 'client'); diff --git a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js b/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js index c26d68c4b5987..0ebf128160b51 100644 --- a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js +++ b/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js @@ -1,19 +1,19 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { Users, Messages } from 'meteor/rocketchat:models'; Meteor.publish('mentionedMessages', function(rid, limit = 50) { if (!this.userId) { return this.ready(); } const publication = this; - const user = RocketChat.models.Users.findOneById(this.userId); + const user = Users.findOneById(this.userId); if (!user) { return this.ready(); } if (!Meteor.call('canAccessRoom', rid, this.userId)) { return this.ready(); } - const cursorHandle = RocketChat.models.Messages.findVisibleByMentionAndRoomId(user.username, rid, { + const cursorHandle = Messages.findVisibleByMentionAndRoomId(user.username, rid, { sort: { ts: -1, }, From ea2b69931958076dcc48c4d37f88ecf8b9ebc2ec Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Fri, 1 Feb 2019 15:18:10 -0200 Subject: [PATCH 4/5] Remove depedency of RC namespace in rc-message-attachements --- packages/rocketchat-message-action/package.js | 1 - .../client/messageAttachment.js | 11 ++++++----- packages/rocketchat-message-attachments/package.js | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/rocketchat-message-action/package.js b/packages/rocketchat-message-action/package.js index 2ff31877235e3..5dff219226d83 100644 --- a/packages/rocketchat-message-action/package.js +++ b/packages/rocketchat-message-action/package.js @@ -9,7 +9,6 @@ Package.onUse(function(api) { api.use([ 'templating', 'ecmascript', - 'rocketchat:lib', ]); api.addFiles('client/stylesheets/messageAction.css', 'client'); api.mainModule('client/index.js', 'client'); diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js index 93b70ba62bf30..1e6b32fc2a3cf 100644 --- a/packages/rocketchat-message-attachments/client/messageAttachment.js +++ b/packages/rocketchat-message-attachments/client/messageAttachment.js @@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { DateFormat } from 'meteor/rocketchat:lib'; import { fixCordova } from 'meteor/rocketchat:lazy-load'; import { Template } from 'meteor/templating'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { getUserPreference } from 'meteor/rocketchat:utils'; +import { Users } from 'meteor/rocketchat:models'; import { renderMessageBody } from 'meteor/rocketchat:ui-utils'; const colors = { @@ -28,11 +29,11 @@ Template.messageAttachment.helpers({ }, loadImage() { if (this.downloadImages !== true) { - const user = RocketChat.models.Users.findOne({ _id: Meteor.userId() }, { fields: { 'settings.autoImageLoad' : 1 } }); - if (RocketChat.getUserPreference(user, 'autoImageLoad') === false) { + const user = Users.findOne({ _id: Meteor.userId() }, { fields: { 'settings.autoImageLoad' : 1 } }); + if (getUserPreference(user, 'autoImageLoad') === false) { return false; } - if (Meteor.Device.isPhone() && RocketChat.getUserPreference(user, 'saveMobileBandwidth') !== true) { + if (Meteor.Device.isPhone() && getUserPreference(user, 'saveMobileBandwidth') !== true) { return false; } } @@ -54,7 +55,7 @@ Template.messageAttachment.helpers({ if (this.collapsed != null) { return this.collapsed; } else { - return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true; + return getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true; } }, time() { diff --git a/packages/rocketchat-message-attachments/package.js b/packages/rocketchat-message-attachments/package.js index 956c10513ea20..2c8e22737fbd9 100644 --- a/packages/rocketchat-message-attachments/package.js +++ b/packages/rocketchat-message-attachments/package.js @@ -14,6 +14,8 @@ Package.onUse(function(api) { 'rocketchat:e2e', 'rocketchat:ui-message', 'rocketchat:ui-utils', + 'rocketchat:utils', + 'rocketchat:models', ]); api.addFiles('client/stylesheets/messageAttachments.css', 'client'); api.mainModule('client/index.js', 'client'); From 4da85d9fd907d8b30b2721e150c0b7ea4c34ab5a Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Fri, 1 Feb 2019 15:27:17 -0200 Subject: [PATCH 5/5] Remove dependdency of RC namespace in rc-message-mark-as-unread --- .../client/actionButton.js | 7 ++++--- .../rocketchat-message-mark-as-unread/package.js | 5 +++-- .../server/unreadMessages.js | 12 ++++++------ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/rocketchat-message-mark-as-unread/client/actionButton.js b/packages/rocketchat-message-mark-as-unread/client/actionButton.js index 4e7a4966715c0..57e1e410d6925 100644 --- a/packages/rocketchat-message-mark-as-unread/client/actionButton.js +++ b/packages/rocketchat-message-mark-as-unread/client/actionButton.js @@ -1,10 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { RocketChat, handleError } from 'meteor/rocketchat:lib'; -import { RoomManager, ChatSubscription } from 'meteor/rocketchat:ui'; +import { RoomManager, MessageAction } from 'meteor/rocketchat:ui-utils'; +import { handleError } from 'meteor/rocketchat:utils'; +import { ChatSubscription } from 'meteor/rocketchat:models'; Meteor.startup(() => { - RocketChat.MessageAction.addButton({ + MessageAction.addButton({ id: 'mark-message-as-unread', icon: 'flag', label: 'Mark_as_unread', diff --git a/packages/rocketchat-message-mark-as-unread/package.js b/packages/rocketchat-message-mark-as-unread/package.js index 40f1a1c1b8d93..45c82b3a49382 100644 --- a/packages/rocketchat-message-mark-as-unread/package.js +++ b/packages/rocketchat-message-mark-as-unread/package.js @@ -7,9 +7,10 @@ Package.describe({ Package.onUse(function(api) { api.use([ 'ecmascript', - 'rocketchat:lib', 'rocketchat:logger', - 'rocketchat:ui', + 'rocketchat:models', + 'rocketchat:ui-utils', + 'rocketchat:utils', 'templating', ]); api.mainModule('client/index.js', 'client'); diff --git a/packages/rocketchat-message-mark-as-unread/server/unreadMessages.js b/packages/rocketchat-message-mark-as-unread/server/unreadMessages.js index 11ed3a839d972..a649537b4563b 100644 --- a/packages/rocketchat-message-mark-as-unread/server/unreadMessages.js +++ b/packages/rocketchat-message-mark-as-unread/server/unreadMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChat } from 'meteor/rocketchat:lib'; +import { Messages, Subscriptions } from 'meteor/rocketchat:models'; import logger from './logger'; Meteor.methods({ @@ -12,7 +12,7 @@ Meteor.methods({ } if (room) { - const lastMessage = RocketChat.models.Messages.findVisibleByRoomId(room, { limit: 1, sort: { ts: -1 } }).fetch()[0]; + const lastMessage = Messages.findVisibleByRoomId(room, { limit: 1, sort: { ts: -1 } }).fetch()[0]; if (lastMessage == null) { throw new Meteor.Error('error-action-not-allowed', 'Not allowed', { @@ -21,10 +21,10 @@ Meteor.methods({ }); } - return RocketChat.models.Subscriptions.setAsUnreadByRoomIdAndUserId(lastMessage.rid, userId, lastMessage.ts); + return Subscriptions.setAsUnreadByRoomIdAndUserId(lastMessage.rid, userId, lastMessage.ts); } - const originalMessage = RocketChat.models.Messages.findOneById(firstUnreadMessage._id, { + const originalMessage = Messages.findOneById(firstUnreadMessage._id, { fields: { u: 1, rid: 1, @@ -38,11 +38,11 @@ Meteor.methods({ action: 'Unread_messages', }); } - const lastSeen = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(originalMessage.rid, userId).ls; + const lastSeen = Subscriptions.findOneByRoomIdAndUserId(originalMessage.rid, userId).ls; if (firstUnreadMessage.ts >= lastSeen) { return logger.connection.debug('Provided message is already marked as unread'); } logger.connection.debug(`Updating unread message of ${ originalMessage.ts } as the first unread`); - return RocketChat.models.Subscriptions.setAsUnreadByRoomIdAndUserId(originalMessage.rid, userId, originalMessage.ts); + return Subscriptions.setAsUnreadByRoomIdAndUserId(originalMessage.rid, userId, originalMessage.ts); }, });