Convert rocketchat-irc to main module structure (#12672)

RocketChat · Nov 20, 2018 · b07fdeb · b07fdeb
1 parent 51df48a
commit b07fdeb
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 4 deletions.
diff --git a/packages/rocketchat-irc/package.js b/packages/rocketchat-irc/package.js
@@ -10,11 +10,9 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'underscore',
 		'rocketchat:lib',
+		'rocketchat:ui',
 	]);
-
-	api.addFiles('server/irc.js', 'server');
-	api.addFiles('server/methods/resetIrcConnection.js', 'server');
-	api.addFiles('server/irc-settings.js', 'server');
+	api.mainModule('server/index.js', 'server');
 });
 
 Npm.depends({

diff --git a/packages/rocketchat-irc/server/index.js b/packages/rocketchat-irc/server/index.js
@@ -0,0 +1,3 @@
+import './irc';
+import './methods/resetIrcConnection';
+import './irc-settings';
diff --git a/packages/rocketchat-irc/server/irc-bridge/index.js b/packages/rocketchat-irc/server/irc-bridge/index.js
@@ -1,3 +1,4 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
 import Queue from 'queue-fifo';
 import * as servers from '../servers';
 import * as peerCommandHandlers from './peerHandlers';

diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateRoom.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 export default function handleOnCreateRoom(user, room) {
 	const users = RocketChat.models.Users.findByRoomId(room._id);
 

diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onCreateUser.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 export default function handleOnCreateUser(newUser) {
 	if (!newUser) {

diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onLogin.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 export default function handleOnLogin(login) {
 	if (login.user === null) {

diff --git a/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js b/packages/rocketchat-irc/server/irc-bridge/localHandlers/onSaveMessage.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 export default function handleOnSaveMessage(message, to) {
 	let toIdentification = '';
 	// Direct message

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/disconnected.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 export default function handleQUIT(args) {
 	const user = RocketChat.models.Users.findOne({

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/joinedChannel.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 export default function handleJoinedChannel(args) {
 	const user = RocketChat.models.Users.findOne({
 		'profile.irc.nick': args.nick,

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/leftChannel.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 export default function handleLeftChannel(args) {
 	const user = RocketChat.models.Users.findOne({
 		'profile.irc.nick': args.nick,

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/nickChanged.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 export default function handleNickChanged(args) {
 	const user = RocketChat.models.Users.findOne({
 		'profile.irc.nick': args.nick,

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/sentMessage.js
@@ -1,3 +1,4 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
 /*
  *
  * Get direct chat room helper

diff --git a/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js b/packages/rocketchat-irc/server/irc-bridge/peerHandlers/userRegistered.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 export default async function handleUserRegistered(args) {
 	// Check if there is an user with the given username

diff --git a/packages/rocketchat-irc/server/irc-settings.js b/packages/rocketchat-irc/server/irc-settings.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.settings.addGroup('IRC_Federation', function() {

diff --git a/packages/rocketchat-irc/server/irc.js b/packages/rocketchat-irc/server/irc.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import Bridge from './irc-bridge';
 
 if (!!RocketChat.settings.get('IRC_Enabled') === true) {

diff --git a/packages/rocketchat-irc/server/methods/resetIrcConnection.js b/packages/rocketchat-irc/server/methods/resetIrcConnection.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 import Bridge from '../irc-bridge';
 
 Meteor.methods({