Remove dependency of RC namespace in rc-emoji-custom and drupal

packages/rocketchat-drupal/lib/common.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 
 // Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal
@@ -25,16 +25,16 @@ const Drupal = new CustomOAuth('drupal', config);
 
 if (Meteor.isServer) {
 	Meteor.startup(function() {
-		RocketChat.settings.get('API_Drupal_URL', function(key, value) {
+		settings.get('API_Drupal_URL', function(key, value) {
 			config.serverURL = value;
 			Drupal.configure(config);
 		});
 	});
 } else {
 	Meteor.startup(function() {
 		Tracker.autorun(function() {
-			if (RocketChat.settings.get('API_Drupal_URL')) {
-				config.serverURL = RocketChat.settings.get('API_Drupal_URL');
+			if (settings.get('API_Drupal_URL')) {
+				config.serverURL = settings.get('API_Drupal_URL');
 				Drupal.configure(config);
 			}
 		});

packages/rocketchat-drupal/package.js

@@ -9,7 +9,7 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'service-configuration',
-		'rocketchat:lib@0.0.1',
+		'rocketchat:settings',
 		'rocketchat:custom-oauth',
 		'templating',
 	]);

packages/rocketchat-drupal/server/startup.js

@@ -1,6 +1,6 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from 'meteor/rocketchat:settings';
 
-RocketChat.settings.addGroup('OAuth', function() {
+settings.addGroup('OAuth', function() {
 	this.section('Drupal', function() {
 		const enableQuery = {
 			_id: 'Accounts_OAuth_Drupal',

packages/rocketchat-emoji-custom/client/admin/adminEmoji.js

@@ -1,9 +1,9 @@
 import { ReactiveVar } from 'meteor/reactive-var';
-import { RocketChat, RocketChatTabBar } from 'meteor/rocketchat:lib';
+import { RocketChatTabBar, SideNav, TabBar } from 'meteor/rocketchat:ui-utils';
 import { Tracker } from 'meteor/tracker';
+import { EmojiCustom } from 'meteor/rocketchat:models';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { SideNav } from 'meteor/rocketchat:ui';
 import s from 'underscore.string';
 
 Template.adminEmoji.helpers({
@@ -49,7 +49,7 @@ Template.adminEmoji.onCreated(function() {
 	this.tabBar.showGroup(FlowRouter.current().route.name);
 	this.tabBarData = new ReactiveVar();
 
-	RocketChat.TabBar.addButton({
+	TabBar.addButton({
 		groups: ['emoji-custom'],
 		id: 'add-emoji',
 		i18nTitle: 'Custom_Emoji_Add',
@@ -58,7 +58,7 @@ Template.adminEmoji.onCreated(function() {
 		order: 1,
 	});
 
-	RocketChat.TabBar.addButton({
+	TabBar.addButton({
 		groups: ['emoji-custom'],
 		id: 'admin-emoji-info',
 		i18nTitle: 'Custom_Emoji_Info',
@@ -85,7 +85,7 @@ Template.adminEmoji.onCreated(function() {
 
 		const limit = (instance.limit != null) ? instance.limit.get() : 0;
 
-		return RocketChat.models.EmojiCustom.find(query, { limit, sort: { name: 1 } }).fetch();
+		return EmojiCustom.find(query, { limit, sort: { name: 1 } }).fetch();
 	};
 });
 
@@ -113,7 +113,7 @@ Template.adminEmoji.events({
 
 	'click .emoji-info'(e, instance) {
 		e.preventDefault();
-		instance.tabBarData.set(RocketChat.models.EmojiCustom.findOne({ _id: this._id }));
+		instance.tabBarData.set(EmojiCustom.findOne({ _id: this._id }));
 		instance.tabBar.open('admin-emoji-info');
 	},
 

packages/rocketchat-emoji-custom/client/admin/emojiEdit.js

@@ -1,8 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:utils';
+import { t, handleError } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 import s from 'underscore.string';
 

packages/rocketchat-emoji-custom/client/admin/emojiInfo.js

@@ -1,9 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { handleError } from 'meteor/rocketchat:lib';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { handleError, t } from 'meteor/rocketchat:utils';
+import { modal } from 'meteor/rocketchat:ui-utils';
 
 Template.emojiInfo.helpers({
 	name() {

packages/rocketchat-emoji-custom/client/admin/startup.js

@@ -1,10 +1,11 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { AdminBox } from 'meteor/rocketchat:ui-utils';
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
-RocketChat.AdminBox.addOption({
+AdminBox.addOption({
 	href: 'emoji-custom',
 	i18nLabel: 'Custom_Emoji',
 	icon: 'emoji',
 	permissionGranted() {
-		return RocketChat.authz.hasPermission('manage-emoji');
+		return hasPermission('manage-emoji');
 	},
 });

packages/rocketchat-emoji-custom/client/index.js

@@ -1,4 +1,3 @@
-import './models/EmojiCustom';
 import './lib/emojiCustom';
 import './notifications/deleteEmojiCustom';
 import './notifications/updateEmojiCustom';

packages/rocketchat-emoji-custom/client/lib/emojiCustom.js

@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
-import { RocketChat } from 'meteor/rocketchat:lib';
 import { isSetNotNull } from '../lib/function-isSet';
-import { RoomManager } from 'meteor/rocketchat:ui';
+import { RoomManager } from 'meteor/rocketchat:ui-utils';
+import { emoji, EmojiPicker } from 'meteor/rocketchat:emoji';
+import { CachedCollectionManager } from 'meteor/rocketchat:ui-cached-collection';
 
 export const getEmojiUrlFromName = function(name, extension) {
 	Session.get;
@@ -25,25 +26,25 @@ export const getEmojiUrlFromName = function(name, extension) {
 Blaze.registerHelper('emojiUrlFromName', getEmojiUrlFromName);
 
 export const deleteEmojiCustom = function(emojiData) {
-	delete RocketChat.emoji.list[`:${ emojiData.name }:`];
-	const arrayIndex = RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(emojiData.name);
+	delete emoji.list[`:${ emojiData.name }:`];
+	const arrayIndex = emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(emojiData.name);
 	if (arrayIndex !== -1) {
-		RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
+		emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
 	}
-	const arrayIndexList = RocketChat.emoji.packages.emojiCustom.list.indexOf(`:${ emojiData.name }:`);
+	const arrayIndexList = emoji.packages.emojiCustom.list.indexOf(`:${ emojiData.name }:`);
 	if (arrayIndexList !== -1) {
-		RocketChat.emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
+		emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
 	}
 	if (isSetNotNull(() => emojiData.aliases)) {
 		for (const alias of emojiData.aliases) {
-			delete RocketChat.emoji.list[`:${ alias }:`];
-			const aliasIndex = RocketChat.emoji.packages.emojiCustom.list.indexOf(`:${ alias }:`);
+			delete emoji.list[`:${ alias }:`];
+			const aliasIndex = emoji.packages.emojiCustom.list.indexOf(`:${ alias }:`);
 			if (aliasIndex !== -1) {
-				RocketChat.emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
+				emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
 			}
 		}
 	}
-	RocketChat.EmojiPicker.updateRecent();
+	EmojiPicker.updateRecent();
 };
 
 export const updateEmojiCustom = function(emojiData) {
@@ -53,40 +54,40 @@ export const updateEmojiCustom = function(emojiData) {
 	const previousExists = isSetNotNull(() => emojiData.previousName);
 	const currentAliases = isSetNotNull(() => emojiData.aliases);
 
-	if (previousExists && isSetNotNull(() => RocketChat.emoji.list[`:${ emojiData.previousName }:`].aliases)) {
-		for (const alias of RocketChat.emoji.list[`:${ emojiData.previousName }:`].aliases) {
-			delete RocketChat.emoji.list[`:${ alias }:`];
-			const aliasIndex = RocketChat.emoji.packages.emojiCustom.list.indexOf(`:${ alias }:`);
+	if (previousExists && isSetNotNull(() => emoji.list[`:${ emojiData.previousName }:`].aliases)) {
+		for (const alias of emoji.list[`:${ emojiData.previousName }:`].aliases) {
+			delete emoji.list[`:${ alias }:`];
+			const aliasIndex = emoji.packages.emojiCustom.list.indexOf(`:${ alias }:`);
 			if (aliasIndex !== -1) {
-				RocketChat.emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
+				emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
 			}
 		}
 	}
 
 	if (previousExists && emojiData.name !== emojiData.previousName) {
-		const arrayIndex = RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(emojiData.previousName);
+		const arrayIndex = emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(emojiData.previousName);
 		if (arrayIndex !== -1) {
-			RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
+			emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
 		}
-		const arrayIndexList = RocketChat.emoji.packages.emojiCustom.list.indexOf(`:${ emojiData.previousName }:`);
+		const arrayIndexList = emoji.packages.emojiCustom.list.indexOf(`:${ emojiData.previousName }:`);
 		if (arrayIndexList !== -1) {
-			RocketChat.emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
+			emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
 		}
-		delete RocketChat.emoji.list[`:${ emojiData.previousName }:`];
+		delete emoji.list[`:${ emojiData.previousName }:`];
 	}
 
-	const categoryIndex = RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(`${ emojiData.name }`);
+	const categoryIndex = emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(`${ emojiData.name }`);
 	if (categoryIndex === -1) {
-		RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.push(`${ emojiData.name }`);
-		RocketChat.emoji.packages.emojiCustom.list.push(`:${ emojiData.name }:`);
+		emoji.packages.emojiCustom.emojisByCategory.rocket.push(`${ emojiData.name }`);
+		emoji.packages.emojiCustom.list.push(`:${ emojiData.name }:`);
 	}
-	RocketChat.emoji.list[`:${ emojiData.name }:`] = Object.assign({ emojiPackage: 'emojiCustom' }, RocketChat.emoji.list[`:${ emojiData.name }:`], emojiData);
+	emoji.list[`:${ emojiData.name }:`] = Object.assign({ emojiPackage: 'emojiCustom' }, emoji.list[`:${ emojiData.name }:`], emojiData);
 	if (currentAliases) {
 		for (const alias of emojiData.aliases) {
-			RocketChat.emoji.packages.emojiCustom.list.push(`:${ alias }:`);
-			RocketChat.emoji.list[`:${ alias }:`] = {};
-			RocketChat.emoji.list[`:${ alias }:`].emojiPackage = 'emojiCustom';
-			RocketChat.emoji.list[`:${ alias }:`].aliasOf = emojiData.name;
+			emoji.packages.emojiCustom.list.push(`:${ alias }:`);
+			emoji.list[`:${ alias }:`] = {};
+			emoji.list[`:${ alias }:`].emojiPackage = 'emojiCustom';
+			emoji.list[`:${ alias }:`].aliasOf = emojiData.name;
 		}
 	}
 
@@ -119,30 +120,30 @@ export const updateEmojiCustom = function(emojiData) {
 		}
 	}
 
-	RocketChat.EmojiPicker.updateRecent();
+	EmojiPicker.updateRecent();
 };
 
-RocketChat.emoji.packages.emojiCustom = {
+emoji.packages.emojiCustom = {
 	emojiCategories: { rocket: 'Custom' },
 	toneList: {},
 	list: [],
 
 	render(html) {
-		const regShortNames = new RegExp(`<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(${ RocketChat.emoji.packages.emojiCustom.list.join('|') })`, 'gi');
+		const regShortNames = new RegExp(`<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(${ emoji.packages.emojiCustom.list.join('|') })`, 'gi');
 
 		// replace regular shortnames first
 		html = html.replace(regShortNames, function(shortname) {
 			// console.log('shortname (preif) ->', shortname, html);
-			if ((typeof shortname === 'undefined') || (shortname === '') || (RocketChat.emoji.packages.emojiCustom.list.indexOf(shortname) === -1)) {
+			if ((typeof shortname === 'undefined') || (shortname === '') || (emoji.packages.emojiCustom.list.indexOf(shortname) === -1)) {
 				// if the shortname doesnt exist just return the entire match
 				return shortname;
 			} else {
 				let emojiAlias = shortname.replace(/:/g, '');
 
-				let dataCheck = RocketChat.emoji.list[shortname];
+				let dataCheck = emoji.list[shortname];
 				if (dataCheck.hasOwnProperty('aliasOf')) {
 					emojiAlias = dataCheck.aliasOf;
-					dataCheck = RocketChat.emoji.list[`:${ emojiAlias }:`];
+					dataCheck = emoji.list[`:${ emojiAlias }:`];
 				}
 
 				return `<span class="emoji" style="background-image:url(${ getEmojiUrlFromName(emojiAlias, dataCheck.extension) });" data-emoji="${ emojiAlias }" title="${ shortname }">${ shortname }</span>`;
@@ -154,19 +155,19 @@ RocketChat.emoji.packages.emojiCustom = {
 };
 
 Meteor.startup(() =>
-	RocketChat.CachedCollectionManager.onLogin(() => {
+	CachedCollectionManager.onLogin(() => {
 		Meteor.call('listEmojiCustom', (error, result) => {
-			RocketChat.emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
-			for (const emoji of result) {
-				RocketChat.emoji.packages.emojiCustom.emojisByCategory.rocket.push(emoji.name);
-				RocketChat.emoji.packages.emojiCustom.list.push(`:${ emoji.name }:`);
-				RocketChat.emoji.list[`:${ emoji.name }:`] = emoji;
-				RocketChat.emoji.list[`:${ emoji.name }:`].emojiPackage = 'emojiCustom';
-				for (const alias of emoji.aliases) {
-					RocketChat.emoji.packages.emojiCustom.list.push(`:${ alias }:`);
-					RocketChat.emoji.list[`:${ alias }:`] = {
+			emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
+			for (const currentEmoji of result) {
+				emoji.packages.emojiCustom.emojisByCategory.rocket.push(currentEmoji.name);
+				emoji.packages.emojiCustom.list.push(`:${ currentEmoji.name }:`);
+				emoji.list[`:${ currentEmoji.name }:`] = currentEmoji;
+				emoji.list[`:${ currentEmoji.name }:`].emojiPackage = 'emojiCustom';
+				for (const alias of currentEmoji.aliases) {
+					emoji.packages.emojiCustom.list.push(`:${ alias }:`);
+					emoji.list[`:${ alias }:`] = {
 						emojiPackage: 'emojiCustom',
-						aliasOf: emoji.name,
+						aliasOf: currentEmoji.name,
 					};
 				}
 			}

packages/rocketchat-emoji-custom/client/notifications/deleteEmojiCustom.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Notifications } from 'meteor/rocketchat:notifications';
 import { deleteEmojiCustom } from '../lib/emojiCustom';
 
 Meteor.startup(() =>
-	RocketChat.Notifications.onLogged('deleteEmojiCustom', (data) => deleteEmojiCustom(data.emojiData))
+	Notifications.onLogged('deleteEmojiCustom', (data) => deleteEmojiCustom(data.emojiData))
 );

packages/rocketchat-emoji-custom/client/notifications/updateEmojiCustom.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Notifications } from 'meteor/rocketchat:notifications';
 import { updateEmojiCustom } from '../lib/emojiCustom';
 
 Meteor.startup(() =>
-	RocketChat.Notifications.onLogged('updateEmojiCustom', (data) => updateEmojiCustom(data.emojiData))
+	Notifications.onLogged('updateEmojiCustom', (data) => updateEmojiCustom(data.emojiData))
 );

packages/rocketchat-emoji-custom/package.js

@@ -10,8 +10,13 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:emoji',
 		'rocketchat:file',
-		'rocketchat:lib',
 		'rocketchat:utils',
+		'rocketchat:models',
+		'rocketchat:settings',
+		'rocketchat:authorization',
+		'rocketchat:notifications',
+		'rocketchat:ui-cached-collection',
+		'rocketchat:ui-utils',
 		'templating',
 		'webapp',
 		'kadira:flow-router',

packages/rocketchat-emoji-custom/server/index.js

@@ -1,6 +1,5 @@
 import './startup/emoji-custom';
 import './startup/settings';
-import './models/EmojiCustom';
 import './publications/fullEmojiData';
 import './methods/listEmojiCustom';
 import './methods/deleteEmojiCustom';

packages/rocketchat-emoji-custom/server/methods/deleteEmojiCustom.js

@@ -1,13 +1,15 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission } from 'meteor/rocketchat:authorization';
+import { EmojiCustom } from 'meteor/rocketchat:models';
+import { Notifications } from 'meteor/rocketchat:notifications';
 import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom';
 
 Meteor.methods({
 	deleteEmojiCustom(emojiID) {
 		let emoji = null;
 
-		if (RocketChat.authz.hasPermission(this.userId, 'manage-emoji')) {
-			emoji = RocketChat.models.EmojiCustom.findOneByID(emojiID);
+		if (hasPermission(this.userId, 'manage-emoji')) {
+			emoji = EmojiCustom.findOneByID(emojiID);
 		} else {
 			throw new Meteor.Error('not_authorized');
 		}
@@ -17,8 +19,8 @@ Meteor.methods({
 		}
 
 		RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${ emoji.name }.${ emoji.extension }`));
-		RocketChat.models.EmojiCustom.removeByID(emojiID);
-		RocketChat.Notifications.notifyLogged('deleteEmojiCustom', { emojiData: emoji });
+		EmojiCustom.removeByID(emojiID);
+		Notifications.notifyLogged('deleteEmojiCustom', { emojiData: emoji });
 
 		return true;
 	},