apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[IMPROVE] Remove index files from action-links, accounts and assets (#17607)

Browse Source
pull/17707/head^2
Marcos Spessatto Defendi 5 years ago committed by GitHub
parent cb46fb3e39
commit 6ed0e44722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
66 changed files with 143 additions and 124 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/accounts/index.js
  2. 3
      app/action-links/client/index.js
  3. 6
      app/action-links/client/init.js
  4. 39
      app/action-links/client/lib/actionLinks.js
  5. 8
      app/action-links/index.js
  6. 2
      app/action-links/server/actionLinkHandler.js
  7. 2
      app/action-links/server/index.js
  8. 2
      app/action-links/server/lib/actionLinks.js
  9. 1
      app/api/index.js
  10. 2
      app/api/server/v1/assets.js
  11. 1
      app/assets/index.js
  12. 1
      app/bigbluebutton/index.js
  13. 1
      app/bigbluebutton/server/index.js
  14. 2
      app/blockstack/server/routes.js
  15. 1
      app/bot-helpers/index.js
  16. 2
      app/integrations/server/api/api.js
  17. 1
      app/livechat/client/index.js
  18. 5
      app/livechat/client/lib/messageTypes.js
  19. 2
      app/livechat/imports/server/rest/agent.js
  20. 2
      app/livechat/imports/server/rest/appearance.js
  21. 2
      app/livechat/imports/server/rest/dashboards.js
  22. 2
      app/livechat/imports/server/rest/departments.js
  23. 2
      app/livechat/imports/server/rest/facebook.js
  24. 2
      app/livechat/imports/server/rest/inquiries.js
  25. 2
      app/livechat/imports/server/rest/integrations.js
  26. 2
      app/livechat/imports/server/rest/messages.js
  27. 2
      app/livechat/imports/server/rest/officeHour.js
  28. 2
      app/livechat/imports/server/rest/queue.js
  29. 2
      app/livechat/imports/server/rest/rooms.js
  30. 2
      app/livechat/imports/server/rest/sms.js
  31. 2
      app/livechat/imports/server/rest/triggers.js
  32. 2
      app/livechat/imports/server/rest/upload.js
  33. 2
      app/livechat/imports/server/rest/users.js
  34. 2
      app/livechat/imports/server/rest/visitors.js
  35. 32
      app/livechat/lib/messageTypes.js
  36. 2
      app/livechat/server/api/v1/agent.js
  37. 2
      app/livechat/server/api/v1/config.js
  38. 2
      app/livechat/server/api/v1/customField.js
  39. 2
      app/livechat/server/api/v1/message.js
  40. 2
      app/livechat/server/api/v1/offlineMessage.js
  41. 2
      app/livechat/server/api/v1/pageVisited.js
  42. 2
      app/livechat/server/api/v1/room.js
  43. 2
      app/livechat/server/api/v1/transcript.js
  44. 2
      app/livechat/server/api/v1/transfer.js
  45. 2
      app/livechat/server/api/v1/videoCall.js
  46. 2
      app/livechat/server/api/v1/visitor.js
  47. 1
      app/livechat/server/index.js
  48. 26
      app/livechat/server/lib/messageTypes.js
  49. 2
      app/livestream/server/routes.js
  50. 2
      app/oauth2-server-config/server/oauth/oauth2-server.js
  51. 2
      app/videobridge/client/actionLink.js
  52. 2
      app/videobridge/server/actionLink.js
  53. 4
      app/videobridge/server/methods/bbb.js
  54. 2
      client/importPackages.js
  55. 2
      ee/app/api-enterprise/server/canned-responses.js
  56. 2
      ee/app/engagement-dashboard/server/api/channels.js
  57. 2
      ee/app/engagement-dashboard/server/api/messages.js
  58. 2
      ee/app/engagement-dashboard/server/api/users.js
  59. 2
      ee/app/livechat/imports/server/rest/departments.js
  60. 2
      ee/app/livechat/imports/server/rest/inquiries.js
  61. 2
      ee/app/livechat/imports/server/rest/rooms.js
  62. 2
      ee/app/livechat/imports/server/rest/sms.js
  63. 2
      ee/app/livechat/imports/server/rest/upload.js
  64. 12
      server/importPackages.js
  65. 2
      server/startup/migrations/v036.js
  66. 2
      server/startup/migrations/v042.js

1
app/accounts/index.js
Unescape View File

@ -1 +0,0 @@
export * from './server/index';

3
app/action-links/client/index.js
Unescape View File

@ -1,5 +1,4 @@
import { actionLinks } from '../both/lib/actionLinks';
import './lib/actionLinks';
import { actionLinks } from './lib/actionLinks';
import './init';
import './stylesheets/actionLinks.css';

6
app/action-links/client/init.js
Unescape View File

@ -1,10 +1,10 @@
import { Blaze } from 'meteor/blaze';
import { Template } from 'meteor/templating';
import { handleError } from '../../utils';
import { fireGlobalEvent, Layout } from '../../ui-utils';
import { handleError } from '../../utils/client';
import { fireGlobalEvent, Layout } from '../../ui-utils/client';
import { messageArgs } from '../../ui-utils/client/lib/messageArgs';
import { actionLinks } from '../both/lib/actionLinks';
import { actionLinks } from './lib/actionLinks';
Template.room.events({

39
app/action-links/client/lib/actionLinks.js
Unescape View File

@ -1,10 +1,40 @@
import { Meteor } from 'meteor/meteor';
import { handleError } from '../../../utils';
import { actionLinks } from '../../both/lib/actionLinks';
// Action Links Handler. This method will be called off the client.
import { handleError } from '../../../utils/client';
import { Messages, Subscriptions } from '../../../models/client';
actionLinks.run = (name, messageId, instance) => {
// Action Links namespace creation.
export const actionLinks = {
actions: {},
register(name, funct) {
actionLinks.actions[name] = funct;
},
getMessage(name, messageId) {
const userId = Meteor.userId();
if (!userId) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: 'actionLinks.getMessage' });
}
const message = Messages.findOne({ _id: messageId });
if (!message) {
throw new Meteor.Error('error-invalid-message', 'Invalid message', { function: 'actionLinks.getMessage' });
}
const subscription = Subscriptions.findOne({
rid: message.rid,
'u._id': userId,
});
if (!subscription) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', { function: 'actionLinks.getMessage' });
}
if (!message.actionLinks || !message.actionLinks[name]) {
throw new Meteor.Error('error-invalid-actionlink', 'Invalid action link', { function: 'actionLinks.getMessage' });
}
return message;
},
run(name, messageId, instance) {
const message = actionLinks.getMessage(name, messageId);
const actionLink = message.actionLinks[name];
@ -24,4 +54,5 @@ actionLinks.run = (name, messageId, instance) => {
handleError(err);
}
});
},
};

8
app/action-links/index.js
Unescape View File

@ -1,8 +0,0 @@
import { Meteor } from 'meteor/meteor';
if (Meteor.isClient) {
module.exports = require('./client/index.js');
}
if (Meteor.isServer) {
module.exports = require('./server/index.js');
}

2
app/action-links/server/actionLinkHandler.js
Unescape View File

@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { actionLinks } from '../both/lib/actionLinks';
import { actionLinks } from './lib/actionLinks';
// Action Links Handler. This method will be called off the client.
Meteor.methods({

2
app/action-links/server/index.js
Unescape View File

@ -1,4 +1,4 @@
import { actionLinks } from '../both/lib/actionLinks';
import { actionLinks } from './lib/actionLinks';
import './actionLinkHandler';
export {

2
app/action-links/both/lib/actionLinks.js → app/action-links/server/lib/actionLinks.js
Unescape View File

@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Messages, Subscriptions } from '../../../models';
import { Messages, Subscriptions } from '../../../models/server';
// Action Links namespace creation.
export const actionLinks = {

1
app/api/index.js
Unescape View File

@ -1 +0,0 @@
export * from './server/index';

2
app/api/server/v1/assets.js
Unescape View File

@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import Busboy from 'busboy';
import { RocketChatAssets } from '../../../assets';
import { RocketChatAssets } from '../../../assets/server';
import { API } from '../api';
API.v1.addRoute('assets.setAsset', { authRequired: true }, {

1
app/assets/index.js
Unescape View File

@ -1 +0,0 @@
export * from './server/index';

1
app/bigbluebutton/index.js
Unescape View File

@ -1 +0,0 @@
export { default } from './server/bigbluebutton-api';

1
app/bigbluebutton/server/index.js
Unescape View File

@ -0,0 +1 @@
export { default } from './bigbluebutton-api';

2
app/blockstack/server/routes.js
Unescape View File

@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
import { settings } from '../../settings';
import { RocketChatAssets } from '../../assets';
import { RocketChatAssets } from '../../assets/server';
WebApp.connectHandlers.use('/_blockstack/manifest', Meteor.bindEnvironment(function(req, res) {
const name = settings.get('Site_Name');

1
app/bot-helpers/index.js
Unescape View File

@ -1 +0,0 @@
import './server/index';

2
app/integrations/server/api/api.js
Unescape View File

@ -12,7 +12,7 @@ import moment from 'moment';
import { logger } from '../logger';
import { processWebhookMessage } from '../../../lib';
import { API, APIClass, defaultRateLimiterOptions } from '../../../api';
import { API, APIClass, defaultRateLimiterOptions } from '../../../api/server';
import * as Models from '../../../models';
import { settings } from '../../../settings/server';

1
app/livechat/client/index.js
Unescape View File

@ -9,3 +9,4 @@ import './stylesheets/livechat.css';
import './views/sideNav/livechat';
import './views/sideNav/livechatFlex';
import './externalFrame';
import './lib/messageTypes';

5
app/livechat/client/lib/messageTypes.js
Unescape View File

@ -0,0 +1,5 @@
import { actionLinks } from '../../../action-links/client';
actionLinks.register('createLivechatCall', function(message, params, instance) {
instance.tabBar.open('video');
});

2
app/livechat/imports/server/rest/agent.js
Unescape View File

@ -1,6 +1,6 @@
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findAgentDepartments } from '../../../server/api/lib/agents';
API.v1.addRoute('livechat/agents/:agentId/departments', { authRequired: true }, {

2
app/livechat/imports/server/rest/appearance.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findAppearance } from '../../../server/api/lib/appearance';
API.v1.addRoute('livechat/appearance', { authRequired: true }, {

2
app/livechat/imports/server/rest/dashboards.js
Unescape View File

@ -1,6 +1,6 @@
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { hasPermission } from '../../../../authorization/server';
import {
findAllChatsStatus,

2
app/livechat/imports/server/rest/departments.js
Unescape View File

@ -1,6 +1,6 @@
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { hasPermission } from '../../../../authorization';
import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models';
import { Livechat } from '../../../server/lib/Livechat';

2
app/livechat/imports/server/rest/facebook.js
Unescape View File

@ -2,7 +2,7 @@ import crypto from 'crypto';
import { Random } from 'meteor/random';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { LivechatRooms, LivechatVisitors } from '../../../../models';
import { settings } from '../../../../settings';
import { Livechat } from '../../../server/lib/Livechat';

2
app/livechat/imports/server/rest/inquiries.js
Unescape View File

@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { hasPermission } from '../../../../authorization';
import { Users, LivechatDepartment, LivechatInquiry } from '../../../../models';
import { findInquiries, findOneInquiryByRoomId } from '../../../server/api/lib/inquiries';

2
app/livechat/imports/server/rest/integrations.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findIntegrationSettings } from '../../../server/api/lib/integrations';
API.v1.addRoute('livechat/integrations.settings', { authRequired: true }, {

2
app/livechat/imports/server/rest/messages.js
Unescape View File

@ -1,7 +1,7 @@
import { check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findExternalMessages } from '../../../server/api/lib/messages';
API.v1.addRoute('livechat/messages.external/:roomId', { authRequired: true }, {

2
app/livechat/imports/server/rest/officeHour.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findLivechatOfficeHours } from '../../../server/api/lib/officeHour';
API.v1.addRoute('livechat/office-hours', { authRequired: true }, {

2
app/livechat/imports/server/rest/queue.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findQueueMetrics } from '../../../server/api/lib/queue';
API.v1.addRoute('livechat/queue', { authRequired: true }, {

2
app/livechat/imports/server/rest/rooms.js
Unescape View File

@ -1,7 +1,7 @@
import { Match, check } from 'meteor/check';
import { hasPermission } from '../../../../authorization/server';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findRooms } from '../../../server/api/lib/rooms';
const validateDateParams = (property, date) => {

2
app/livechat/imports/server/rest/sms.js
Unescape View File

@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { LivechatRooms, LivechatVisitors, LivechatDepartment } from '../../../../models';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { SMS } from '../../../../sms';
import { Livechat } from '../../../server/lib/Livechat';

2
app/livechat/imports/server/rest/triggers.js
Unescape View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findTriggers, findTriggerById } from '../../../server/api/lib/triggers';
API.v1.addRoute('livechat/triggers', { authRequired: true }, {

2
app/livechat/imports/server/rest/upload.js
Unescape View File

@ -6,7 +6,7 @@ import { settings } from '../../../../settings';
import { Settings, LivechatRooms, LivechatVisitors } from '../../../../models';
import { fileUploadIsValidContentType } from '../../../../utils';
import { FileUpload } from '../../../../file-upload';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
let maxFileSize;

2
app/livechat/imports/server/rest/users.js
Unescape View File

@ -2,7 +2,7 @@ import { check } from 'meteor/check';
import _ from 'underscore';
import { hasPermission } from '../../../../authorization';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { Users } from '../../../../models';
import { Livechat } from '../../../server/lib/Livechat';
import { findAgents, findManagers } from '../../../server/api/lib/users';

2
app/livechat/imports/server/rest/visitors.js
Unescape View File

@ -1,7 +1,7 @@
import { check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findVisitorInfo, findVisitedPages, findChatHistory } from '../../../server/api/lib/visitors';
API.v1.addRoute('livechat/visitors.info', { authRequired: true }, {

32
app/livechat/lib/messageTypes.js
Unescape View File

@ -1,12 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Livechat } from 'meteor/rocketchat:livechat';
import { MessageTypes } from '../../ui-utils';
import { actionLinks } from '../../action-links';
import { Notifications } from '../../notifications';
import { Messages, LivechatRooms } from '../../models';
import { settings } from '../../settings';
MessageTypes.registerType({
id: 'livechat_navigation_history',
@ -60,29 +54,3 @@ MessageTypes.registerType({
system: true,
message: 'New_videocall_request',
});
actionLinks.register('createLivechatCall', function(message, params, instance) {
if (Meteor.isClient) {
instance.tabBar.open('video');
}
});
actionLinks.register('denyLivechatCall', function(message/* , params*/) {
if (Meteor.isServer) {
const user = Meteor.user();
Messages.createWithTypeRoomIdMessageAndUser('command', message.rid, 'endCall', user);
Notifications.notifyRoom(message.rid, 'deleteMessage', { _id: message._id });
const language = user.language || settings.get('Language') || 'en';
Livechat.closeRoom({
user,
room: LivechatRooms.findOneById(message.rid),
comment: TAPi18n.__('Videocall_declined', { lng: language }),
});
Meteor.defer(() => {
Messages.setHiddenById(message._id);
});
}
});

2
app/livechat/server/api/v1/agent.js
Unescape View File

@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findRoom, findGuest, findAgent, findOpenRoom } from '../lib/livechat';
import { Livechat } from '../../lib/Livechat';

2
app/livechat/server/api/v1/config.js
Unescape View File

@ -1,6 +1,6 @@
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findGuest, settings, online, findOpenRoom, getExtraConfigInfo, findAgent } from '../lib/livechat';
API.v1.addRoute('livechat/config', {

2
app/livechat/server/api/v1/customField.js
Unescape View File

@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findGuest } from '../lib/livechat';
import { Livechat } from '../../lib/Livechat';
import { findLivechatCustomFields, findCustomFieldById } from '../lib/customFields';

2
app/livechat/server/api/v1/message.js
Unescape View File

@ -4,7 +4,7 @@ import { Random } from 'meteor/random';
import { Messages, LivechatRooms, LivechatVisitors } from '../../../../models';
import { hasPermission } from '../../../../authorization';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { loadMessageHistory } from '../../../../lib';
import { findGuest, findRoom, normalizeHttpHeaderData } from '../lib/livechat';
import { Livechat } from '../../lib/Livechat';

2
app/livechat/server/api/v1/offlineMessage.js
Unescape View File

@ -1,7 +1,7 @@
import { Match, check } from 'meteor/check';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { Livechat } from '../../lib/Livechat';
API.v1.addRoute('livechat/offline.message', {

2
app/livechat/server/api/v1/pageVisited.js
Unescape View File

@ -1,7 +1,7 @@
import { Match, check } from 'meteor/check';
import _ from 'underscore';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { Livechat } from '../../lib/Livechat';
API.v1.addRoute('livechat/page.visited', {

2
app/livechat/server/api/v1/room.js
Unescape View File

@ -5,7 +5,7 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { settings as rcSettings } from '../../../../settings';
import { Messages, LivechatRooms } from '../../../../models';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findGuest, findRoom, getRoom, settings, findAgent, onCheckRoomParams } from '../lib/livechat';
import { Livechat } from '../../lib/Livechat';
import { normalizeTransferredByData } from '../../lib/Helper';

2
app/livechat/server/api/v1/transcript.js
Unescape View File

@ -1,7 +1,7 @@
import { check } from 'meteor/check';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { Livechat } from '../../lib/Livechat';
API.v1.addRoute('livechat/transcript', {

2
app/livechat/server/api/v1/transfer.js
Unescape View File

@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import { LivechatRooms } from '../../../../models';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findLivechatTransferHistory } from '../lib/transfer';
API.v1.addRoute('livechat/transfer.history/:rid', { authRequired: true }, {

2
app/livechat/server/api/v1/videoCall.js
Unescape View File

@ -4,7 +4,7 @@ import { Random } from 'meteor/random';
import { Messages } from '../../../../models';
import { settings as rcSettings } from '../../../../settings';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findGuest, getRoom, settings } from '../lib/livechat';
API.v1.addRoute('livechat/video.call/:token', {

2
app/livechat/server/api/v1/visitor.js
Unescape View File

@ -3,7 +3,7 @@ import { Match, check } from 'meteor/check';
import { LivechatRooms, LivechatVisitors, LivechatCustomField } from '../../../../models';
import { hasPermission } from '../../../../authorization';
import { API } from '../../../../api';
import { API } from '../../../../api/server';
import { findGuest, normalizeHttpHeaderData } from '../lib/livechat';
import { Livechat } from '../../lib/Livechat';

1
app/livechat/server/index.js
Unescape View File

@ -84,5 +84,6 @@ import './sendMessageBySMS';
import './api';
import './api/rest';
import './externalFrame';
import './lib/messageTypes';
export { Livechat } from './lib/Livechat';

26
app/livechat/server/lib/messageTypes.js
Unescape View File

@ -0,0 +1,26 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { actionLinks } from '../../../action-links/server';
import { Notifications } from '../../../notifications/server';
import { Messages, LivechatRooms } from '../../../models/server';
import { settings } from '../../../settings/server';
import { Livechat } from './Livechat';
actionLinks.register('denyLivechatCall', function(message/* , params*/) {
const user = Meteor.user();
Messages.createWithTypeRoomIdMessageAndUser('command', message.rid, 'endCall', user);
Notifications.notifyRoom(message.rid, 'deleteMessage', { _id: message._id });
const language = user.language || settings.get('Language') || 'en';
Livechat.closeRoom({
user,
room: LivechatRooms.findOneById(message.rid),
comment: TAPi18n.__('Videocall_declined', { lng: language }),
});
Meteor.defer(() => {
Messages.setHiddenById(message._id);
});
});

2
app/livestream/server/routes.js
Unescape View File

@ -3,7 +3,7 @@ import google from 'googleapis';
import { settings } from '../../settings';
import { Users } from '../../models';
import { API } from '../../api';
import { API } from '../../api/server';
const { OAuth2 } = google.auth;

2
app/oauth2-server-config/server/oauth/oauth2-server.js
Unescape View File

@ -3,7 +3,7 @@ import { WebApp } from 'meteor/webapp';
import { OAuth2Server } from 'meteor/rocketchat:oauth2-server';
import { OAuthApps, Users } from '../../../models';
import { API } from '../../../api';
import { API } from '../../../api/server';
const oauth2server = new OAuth2Server({
accessTokensCollectionName: 'rocketchat_oauth_access_tokens',

2
app/videobridge/client/actionLink.js
Unescape View File

@ -2,7 +2,7 @@ import { Session } from 'meteor/session';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import { actionLinks } from '../../action-links';
import { actionLinks } from '../../action-links/client';
import { Rooms } from '../../models';
actionLinks.register('joinJitsiCall', function(message, params, instance) {

2
app/videobridge/server/actionLink.js
Unescape View File

@ -1,4 +1,4 @@
import { actionLinks } from '../../action-links';
import { actionLinks } from '../../action-links/server';
actionLinks.register('joinJitsiCall', function(/* message, params*/) {

4
app/videobridge/server/methods/bbb.js
Unescape View File

@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
import { HTTP } from 'meteor/http';
import xml2js from 'xml2js';
import BigBlueButtonApi from '../../../bigbluebutton';
import BigBlueButtonApi from '../../../bigbluebutton/server';
import { settings } from '../../../settings';
import { Rooms, Users } from '../../../models';
import { saveStreamingOptions } from '../../../channel-settings';
import { API } from '../../../api';
import { API } from '../../../api/server';
const parser = new xml2js.Parser({
explicitRoot: true,

2
client/importPackages.js
Unescape View File

@ -102,7 +102,7 @@ import '../app/notifications';
import '../app/promises/client';
import '../app/ui-utils';
import '../app/ui-cached-collection';
import '../app/action-links';
import '../app/action-links/client';
import '../app/reactions/client';
import '../app/livechat/client';
import '../app/meteor-autocomplete/client';

2
ee/app/api-enterprise/server/canned-responses.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../app/api';
import { API } from '../../../../app/api/server';
import { findAllCannedResponses } from './lib/canned-responses';
API.v1.addRoute('canned-responses.get', { authRequired: true }, {

2
ee/app/engagement-dashboard/server/api/channels.js
Unescape View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import { API } from '../../../../../app/api';
import { API } from '../../../../../app/api/server';
import { findAllChannelsWithNumberOfMessages } from '../lib/channels';
import { transformDatesForAPI } from './helpers/date';

2
ee/app/engagement-dashboard/server/api/messages.js
Unescape View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import { API } from '../../../../../app/api';
import { API } from '../../../../../app/api/server';
import { findWeeklyMessagesSentData, findMessagesSentOrigin, findTopFivePopularChannelsByMessageSentQuantity } from '../lib/messages';
import { transformDatesForAPI } from './helpers/date';

2
ee/app/engagement-dashboard/server/api/users.js
Unescape View File

@ -1,6 +1,6 @@
import { check } from 'meteor/check';
import { API } from '../../../../../app/api';
import { API } from '../../../../../app/api/server';
import {
findWeeklyUsersRegisteredData,
findActiveUsersMonthlyData,

2
ee/app/livechat/imports/server/rest/departments.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../../../app/api';
import { API } from '../../../../../../app/api/server';
import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
const endpointsToRunAsUser = {

2
ee/app/livechat/imports/server/rest/inquiries.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../../../app/api';
import { API } from '../../../../../../app/api/server';
import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
const endpointsToRunAsUser = {

2
ee/app/livechat/imports/server/rest/rooms.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../../../app/api';
import { API } from '../../../../../../app/api/server';
import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
const endpointsToRunAsUser = {

2
ee/app/livechat/imports/server/rest/sms.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../../../app/api';
import { API } from '../../../../../../app/api/server';
import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
const endpointsToRunAsUser = {

2
ee/app/livechat/imports/server/rest/upload.js
Unescape View File

@ -1,4 +1,4 @@
import { API } from '../../../../../../app/api';
import { API } from '../../../../../../app/api/server';
import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
const endpointsToRunAsUser = {

12
server/importPackages.js
Unescape View File

@ -1,14 +1,14 @@
import '../app/cors/server';
import '../app/sms';
import '../app/2fa/server';
import '../app/accounts';
import '../app/accounts/server';
import '../app/analytics/server';
import '../app/api';
import '../app/assets';
import '../app/api/server';
import '../app/assets/server';
import '../app/authorization';
import '../app/autolinker/server';
import '../app/autotranslate/server';
import '../app/bot-helpers';
import '../app/bot-helpers/server';
import '../app/cas/server';
import '../app/channel-settings';
import '../app/channel-settings-mail-messages/server';
@ -98,7 +98,7 @@ import '../app/version-check/server';
import '../app/search/server';
import '../app/chatpal-search/server';
import '../app/discussion/server';
import '../app/bigbluebutton';
import '../app/bigbluebutton/server';
import '../app/mail-messages/server';
import '../app/user-status';
import '../app/utils';
@ -109,6 +109,6 @@ import '../app/callbacks';
import '../app/notifications';
import '../app/promises/server';
import '../app/ui-utils';
import '../app/action-links';
import '../app/action-links/server';
import '../app/reactions/server';
import '../app/livechat/server';

2
server/startup/migrations/v036.js
Unescape View File

@ -5,7 +5,7 @@ import { HTTP } from 'meteor/http';
import { Migrations } from '../../../app/migrations';
import { Settings } from '../../../app/models';
import { RocketChatAssets } from '../../../app/assets';
import { RocketChatAssets } from '../../../app/assets/server';
Migrations.add({
version: 36,

2
server/startup/migrations/v042.js
Unescape View File

@ -2,7 +2,7 @@ import { Mongo } from 'meteor/mongo';
import { Migrations } from '../../../app/migrations';
import { settings } from '../../../app/settings';
import { RocketChatAssets } from '../../../app/assets';
import { RocketChatAssets } from '../../../app/assets/server';
Migrations.add({
version: 42,

Write Preview
Loading…
Cancel
Save