From ed092fbe490c21d64c071772ce1da66515837353 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Fri, 15 Mar 2019 15:51:15 -0300 Subject: [PATCH] Convert imports to relative paths (#13740) --- app/2fa/client/TOTPPassword.js | 4 +- app/2fa/client/accountSecurity.js | 6 +- app/2fa/server/lib/totp.js | 4 +- app/2fa/server/loginHandler.js | 4 +- app/2fa/server/methods/disable.js | 2 +- app/2fa/server/methods/enable.js | 2 +- app/2fa/server/methods/regenerateCodes.js | 2 +- app/2fa/server/methods/validateTempToken.js | 2 +- app/2fa/server/startup/settings.js | 2 +- app/action-links/both/lib/actionLinks.js | 2 +- app/action-links/client/init.js | 4 +- app/action-links/client/lib/actionLinks.js | 2 +- app/analytics/client/loadScript.js | 2 +- app/analytics/client/trackEvents.js | 6 +- app/analytics/server/settings.js | 2 +- app/api/server/api.js | 10 +- app/api/server/default/info.js | 4 +- .../helpers/composeRoomWithLastMessage.js | 2 +- app/api/server/helpers/getLoggedInUser.js | 2 +- app/api/server/helpers/getPaginationItems.js | 2 +- app/api/server/helpers/getUserFromParams.js | 2 +- app/api/server/helpers/getUserInfo.js | 4 +- app/api/server/helpers/insertUserObject.js | 2 +- app/api/server/helpers/parseJsonQuery.js | 2 +- app/api/server/settings.js | 2 +- app/api/server/v1/assets.js | 2 +- app/api/server/v1/channels.js | 6 +- app/api/server/v1/chat.js | 8 +- app/api/server/v1/commands.js | 4 +- app/api/server/v1/emoji-custom.js | 2 +- app/api/server/v1/groups.js | 6 +- app/api/server/v1/im.js | 10 +- app/api/server/v1/integrations.js | 4 +- app/api/server/v1/misc.js | 8 +- app/api/server/v1/permissions.js | 4 +- app/api/server/v1/roles.js | 2 +- app/api/server/v1/rooms.js | 4 +- app/api/server/v1/settings.js | 4 +- app/api/server/v1/stats.js | 4 +- app/api/server/v1/subscriptions.js | 2 +- app/api/server/v1/users.js | 10 +- app/api/server/v1/video-conference.js | 2 +- app/apps/client/admin/appInstall.js | 2 +- app/apps/client/admin/appLogs.js | 2 +- app/apps/client/admin/appManage.js | 6 +- app/apps/client/admin/apps.js | 2 +- app/apps/client/communication/websockets.js | 4 +- app/apps/client/orchestrator.js | 8 +- app/apps/server/bridges/commands.js | 2 +- app/apps/server/bridges/internal.js | 2 +- app/apps/server/bridges/messages.js | 6 +- app/apps/server/bridges/rooms.js | 4 +- app/apps/server/bridges/settings.js | 2 +- app/apps/server/communication/methods.js | 4 +- app/apps/server/communication/rest.js | 2 +- app/apps/server/converters/messages.js | 2 +- app/apps/server/converters/rooms.js | 2 +- app/apps/server/converters/settings.js | 2 +- app/apps/server/converters/users.js | 2 +- app/apps/server/orchestrator.js | 4 +- app/assets/server/assets.js | 10 +- app/authorization/client/hasPermission.js | 2 +- app/authorization/client/hasRole.js | 2 +- .../client/lib/ChatPermissions.js | 2 +- app/authorization/client/route.js | 2 +- app/authorization/client/startup.js | 4 +- app/authorization/client/usersNameChanged.js | 4 +- app/authorization/client/views/permissions.js | 2 +- .../client/views/permissionsRole.js | 6 +- .../server/functions/addUserRoles.js | 2 +- .../server/functions/canAccessRoom.js | 4 +- .../server/functions/getRoles.js | 2 +- .../server/functions/getUsersInRole.js | 2 +- .../server/functions/hasPermission.js | 2 +- app/authorization/server/functions/hasRole.js | 2 +- .../server/functions/removeUserFromRoles.js | 2 +- .../server/methods/addPermissionToRole.js | 2 +- .../server/methods/addUserToRole.js | 6 +- .../server/methods/deleteRole.js | 2 +- .../methods/removeRoleFromPermission.js | 2 +- .../server/methods/removeUserFromRole.js | 6 +- app/authorization/server/methods/saveRole.js | 6 +- .../server/publications/permissions.js | 4 +- .../server/publications/roles.js | 2 +- app/authorization/server/startup.js | 2 +- app/autolinker/client/client.js | 4 +- app/autolinker/server/settings.js | 2 +- app/autotranslate/client/lib/actionButton.js | 8 +- app/autotranslate/client/lib/autotranslate.js | 10 +- app/autotranslate/client/lib/tabBar.js | 6 +- .../client/views/autoTranslateFlexTab.js | 4 +- app/autotranslate/server/autotranslate.js | 8 +- .../server/methods/getSupportedLanguages.js | 2 +- .../server/methods/saveSettings.js | 4 +- .../server/methods/translateMessage.js | 2 +- app/autotranslate/server/permissions.js | 2 +- app/autotranslate/server/settings.js | 2 +- app/blockstack/server/logger.js | 2 +- app/blockstack/server/loginHandler.js | 6 +- app/blockstack/server/routes.js | 4 +- app/blockstack/server/settings.js | 2 +- app/blockstack/server/userHandler.js | 2 +- app/bot-helpers/server/index.js | 6 +- app/bot-helpers/server/settings.js | 2 +- app/cas/client/cas_client.js | 2 +- app/cas/server/cas_rocketchat.js | 4 +- app/cas/server/cas_server.js | 6 +- .../client/lib/startup.js | 4 +- .../client/views/mailMessagesInstructions.js | 6 +- .../server/lib/startup.js | 2 +- .../server/methods/mailMessages.js | 10 +- .../client/startup/messageTypes.js | 4 +- app/channel-settings/client/startup/tabBar.js | 2 +- .../client/startup/trackSettingsChange.js | 8 +- .../client/views/channelSettings.js | 12 +- .../server/functions/saveReactWhenReadOnly.js | 2 +- .../server/functions/saveRoomAnnouncement.js | 2 +- .../server/functions/saveRoomCustomFields.js | 2 +- .../server/functions/saveRoomDescription.js | 2 +- .../server/functions/saveRoomName.js | 4 +- .../server/functions/saveRoomReadOnly.js | 4 +- .../functions/saveRoomSystemMessages.js | 2 +- .../server/functions/saveRoomTokens.js | 2 +- .../server/functions/saveRoomTopic.js | 2 +- .../server/functions/saveRoomType.js | 4 +- .../server/functions/saveStreamingOptions.js | 2 +- .../server/methods/saveRoomSettings.js | 6 +- app/channel-settings/server/startup.js | 2 +- app/chatpal-search/client/route.js | 2 +- app/chatpal-search/client/template/admin.js | 4 +- app/chatpal-search/client/template/result.js | 6 +- app/chatpal-search/server/provider/index.js | 2 +- .../server/provider/provider.js | 4 +- app/chatpal-search/server/utils/logger.js | 2 +- app/cloud/client/admin/cloud.js | 2 +- app/cloud/client/index.js | 4 +- .../server/functions/connectWorkspace.js | 4 +- .../functions/finishOAuthAuthorization.js | 4 +- .../functions/getOAuthAuthorizationUrl.js | 4 +- app/cloud/server/functions/getRedirectUri.js | 2 +- .../functions/getWorkspaceAccessToken.js | 4 +- .../server/functions/getWorkspaceLicense.js | 4 +- .../functions/retrieveRegistrationStatus.js | 4 +- app/cloud/server/index.js | 2 +- app/cloud/server/methods.js | 4 +- app/colors/client/client.js | 4 +- app/colors/server/settings.js | 2 +- app/cors/lib/common.js | 2 +- app/cors/server/cors.js | 4 +- app/crowd/server/crowd.js | 10 +- app/crowd/server/settings.js | 2 +- .../server/custom_oauth_server.js | 4 +- app/custom-sounds/client/admin/adminSounds.js | 4 +- app/custom-sounds/client/admin/soundEdit.js | 2 +- app/custom-sounds/client/admin/soundInfo.js | 4 +- app/custom-sounds/client/admin/startup.js | 4 +- app/custom-sounds/client/lib/CustomSounds.js | 2 +- .../client/notifications/deleteCustomSound.js | 4 +- .../client/notifications/updateCustomSound.js | 4 +- .../server/methods/deleteCustomSound.js | 6 +- .../server/methods/insertOrUpdateSound.js | 6 +- .../server/methods/listCustomSounds.js | 2 +- .../server/methods/uploadCustomSound.js | 6 +- .../server/publications/customSounds.js | 2 +- .../server/startup/custom-sounds.js | 4 +- .../server/startup/permissions.js | 2 +- app/custom-sounds/server/startup/settings.js | 2 +- app/dolphin/lib/common.js | 8 +- app/dolphin/server/startup.js | 2 +- app/drupal/lib/common.js | 4 +- app/drupal/server/startup.js | 2 +- app/e2e/client/accountEncryption.js | 6 +- app/e2e/client/events.js | 2 +- app/e2e/client/rocketchat.e2e.js | 10 +- app/e2e/client/rocketchat.e2e.room.js | 6 +- app/e2e/client/tabbar.js | 6 +- app/e2e/server/index.js | 4 +- app/e2e/server/methods/fetchMyKeys.js | 2 +- .../methods/getUsersOfRoomWithoutKey.js | 2 +- .../server/methods/requestSubscriptionKeys.js | 4 +- app/e2e/server/methods/resetUserE2EKey.js | 4 +- app/e2e/server/methods/setRoomKeyID.js | 2 +- .../methods/setUserPublicAndPivateKeys.js | 2 +- app/e2e/server/methods/updateGroupKey.js | 2 +- app/e2e/server/settings.js | 2 +- app/emoji-custom/client/admin/adminEmoji.js | 4 +- app/emoji-custom/client/admin/emojiEdit.js | 2 +- app/emoji-custom/client/admin/emojiInfo.js | 4 +- app/emoji-custom/client/admin/startup.js | 4 +- app/emoji-custom/client/lib/emojiCustom.js | 6 +- .../client/notifications/deleteEmojiCustom.js | 2 +- .../client/notifications/updateEmojiCustom.js | 2 +- .../server/methods/deleteEmojiCustom.js | 6 +- .../server/methods/insertOrUpdateEmoji.js | 6 +- .../server/methods/listEmojiCustom.js | 2 +- .../server/methods/uploadEmojiCustom.js | 6 +- .../server/publications/fullEmojiData.js | 2 +- .../server/startup/emoji-custom.js | 4 +- app/emoji-custom/server/startup/settings.js | 2 +- app/emoji-emojione/lib/rocketchat.js | 4 +- app/emoji-emojione/server/callbacks.js | 2 +- app/emoji/client/emojiParser.js | 4 +- .../server/lib/RocketChat.ErrorHandler.js | 6 +- app/error-handler/server/startup/settings.js | 2 +- .../federatedResources/FederatedMessage.js | 6 +- .../federatedResources/FederatedRoom.js | 4 +- .../federatedResources/FederatedUser.js | 2 +- app/federation/server/federation-settings.js | 4 +- app/federation/server/logger.js | 2 +- app/federation/server/main.js | 6 +- .../server/methods/federationAddUser.js | 2 +- app/federation/server/peerClient.js | 6 +- app/federation/server/peerDNS.js | 2 +- .../server/peerServer/peerServer.js | 8 +- .../server/peerServer/routes/events.js | 4 +- .../server/peerServer/routes/uploads.js | 6 +- .../server/peerServer/routes/users.js | 4 +- app/federation/server/settingsUpdater.js | 2 +- .../client/lib/fileUploadHandler.js | 2 +- app/file-upload/lib/FileUpload.js | 8 +- app/file-upload/lib/FileUploadBase.js | 4 +- app/file-upload/server/config/AmazonS3.js | 2 +- app/file-upload/server/config/FileSystem.js | 2 +- .../server/config/GoogleStorage.js | 2 +- app/file-upload/server/config/GridFS.js | 2 +- app/file-upload/server/config/Webdav.js | 2 +- .../server/config/_configUploadStorage.js | 2 +- app/file-upload/server/lib/FileUpload.js | 8 +- app/file-upload/server/lib/proxy.js | 4 +- app/file-upload/server/lib/requests.js | 2 +- .../server/methods/getS3FileUrl.js | 4 +- .../server/methods/sendFileMessage.js | 4 +- app/file-upload/server/startup/settings.js | 2 +- app/github-enterprise/lib/common.js | 4 +- app/github-enterprise/server/startup.js | 2 +- app/gitlab/lib/common.js | 4 +- app/gitlab/server/startup.js | 2 +- app/google-vision/client/googlevision.js | 4 +- app/google-vision/server/googlevision.js | 10 +- app/google-vision/server/settings.js | 2 +- app/grant-facebook/server/index.js | 2 +- app/grant-github/server/index.js | 2 +- app/grant-google/server/index.js | 2 +- app/grant/server/authenticate.js | 6 +- app/grant/server/grant.js | 2 +- app/graphql/server/api.js | 2 +- app/graphql/server/helpers/authenticated.js | 2 +- .../server/resolvers/accounts/index.js | 2 +- .../server/resolvers/channels/Channel-type.js | 2 +- .../resolvers/channels/channelByName.js | 2 +- .../server/resolvers/channels/channels.js | 2 +- .../resolvers/channels/channelsByUser.js | 2 +- .../resolvers/channels/createChannel.js | 2 +- .../resolvers/channels/deleteChannel.js | 2 +- .../resolvers/channels/directChannel.js | 2 +- .../server/resolvers/channels/hideChannel.js | 2 +- .../server/resolvers/channels/leaveChannel.js | 2 +- .../server/resolvers/messages/Message-type.js | 2 +- .../messages/addReactionToMessage.js | 2 +- .../resolvers/messages/chatMessageAdded.js | 4 +- .../resolvers/messages/deleteMessage.js | 2 +- .../server/resolvers/messages/editMessage.js | 2 +- .../server/resolvers/messages/messages.js | 2 +- .../server/resolvers/messages/sendMessage.js | 2 +- .../server/resolvers/users/User-type.js | 2 +- .../server/resolvers/users/setStatus.js | 2 +- app/graphql/server/settings.js | 2 +- app/highlight-words/client/client.js | 4 +- app/iframe-login/client/iframe_client.js | 2 +- app/iframe-login/server/iframe_rocketchat.js | 2 +- app/importer-csv/client/adder.js | 2 +- app/importer-csv/lib/info.js | 2 +- app/importer-csv/server/adder.js | 2 +- app/importer-csv/server/importer.js | 8 +- .../client/adder.js | 2 +- app/importer-hipchat-enterprise/lib/info.js | 2 +- .../server/adder.js | 2 +- .../server/importer.js | 6 +- app/importer-hipchat/client/adder.js | 2 +- app/importer-hipchat/lib/info.js | 2 +- app/importer-hipchat/server/adder.js | 2 +- app/importer-hipchat/server/importer.js | 8 +- app/importer-slack-users/client/adder.js | 2 +- app/importer-slack-users/lib/info.js | 2 +- app/importer-slack-users/server/adder.js | 2 +- app/importer-slack-users/server/importer.js | 6 +- app/importer-slack/client/adder.js | 2 +- app/importer-slack/lib/info.js | 2 +- app/importer-slack/server/adder.js | 2 +- app/importer-slack/server/importer.js | 10 +- .../client/ImporterWebsocketReceiver.js | 2 +- app/importer/client/admin/adminImport.js | 6 +- .../client/admin/adminImportHistory.js | 6 +- .../client/admin/adminImportPrepare.js | 8 +- .../client/admin/adminImportProgress.js | 4 +- app/importer/server/classes/ImporterBase.js | 8 +- .../methods/downloadPublicImportFile.js | 4 +- .../server/methods/getImportFileData.js | 4 +- .../server/methods/getImportProgress.js | 4 +- .../methods/getLatestImportOperations.js | 2 +- .../server/methods/getSelectionData.js | 4 +- app/importer/server/methods/prepareImport.js | 4 +- app/importer/server/methods/restartImport.js | 4 +- app/importer/server/methods/setupImporter.js | 4 +- app/importer/server/methods/startImport.js | 4 +- .../server/methods/uploadImportFile.js | 6 +- app/importer/server/models/Imports.js | 2 +- app/importer/server/models/RawImports.js | 2 +- app/importer/server/startup/store.js | 4 +- app/integrations/client/route.js | 2 +- app/integrations/client/startup.js | 4 +- app/integrations/client/views/integrations.js | 2 +- .../client/views/integrationsIncoming.js | 6 +- .../client/views/integrationsNew.js | 2 +- .../client/views/integrationsOutgoing.js | 6 +- .../views/integrationsOutgoingHistory.js | 4 +- app/integrations/server/api/api.js | 6 +- app/integrations/server/lib/triggerHandler.js | 6 +- app/integrations/server/lib/validation.js | 4 +- app/integrations/server/logger.js | 2 +- .../server/methods/clearIntegrationHistory.js | 4 +- .../incoming/addIncomingIntegration.js | 4 +- .../incoming/deleteIncomingIntegration.js | 4 +- .../incoming/updateIncomingIntegration.js | 4 +- .../outgoing/addOutgoingIntegration.js | 4 +- .../outgoing/deleteOutgoingIntegration.js | 4 +- .../outgoing/replayOutgoingIntegration.js | 4 +- .../outgoing/updateOutgoingIntegration.js | 4 +- .../server/publications/integrationHistory.js | 4 +- .../server/publications/integrations.js | 4 +- app/integrations/server/triggers.js | 2 +- app/irc/server/irc-bridge/index.js | 2 +- .../irc-bridge/localHandlers/onCreateRoom.js | 2 +- .../irc-bridge/localHandlers/onCreateUser.js | 2 +- .../irc-bridge/localHandlers/onLogin.js | 2 +- .../irc-bridge/localHandlers/onSaveMessage.js | 2 +- .../irc-bridge/peerHandlers/disconnected.js | 2 +- .../irc-bridge/peerHandlers/joinedChannel.js | 4 +- .../irc-bridge/peerHandlers/leftChannel.js | 4 +- .../irc-bridge/peerHandlers/nickChanged.js | 2 +- .../irc-bridge/peerHandlers/sentMessage.js | 4 +- .../irc-bridge/peerHandlers/userRegistered.js | 2 +- app/irc/server/irc-settings.js | 2 +- app/irc/server/irc.js | 2 +- app/irc/server/methods/resetIrcConnection.js | 4 +- app/issuelinks/client/client.js | 4 +- app/issuelinks/server/settings.js | 2 +- app/katex/lib/katex.js | 4 +- app/katex/server/settings.js | 2 +- app/ldap/server/ldap.js | 4 +- app/ldap/server/loginHandler.js | 6 +- app/ldap/server/settings.js | 2 +- app/ldap/server/sync.js | 16 +- app/ldap/server/syncUsers.js | 4 +- app/ldap/server/testConnection.js | 4 +- app/lib/client/CustomTranslations.js | 2 +- app/lib/client/OAuthProxy.js | 2 +- app/lib/client/UserDeleted.js | 4 +- app/lib/client/defaultTabBars.js | 6 +- app/lib/client/lib/LoginPresence.js | 2 +- app/lib/client/lib/formatDate.js | 4 +- app/lib/client/lib/settings.js | 8 +- app/lib/client/lib/startup/commands.js | 2 +- app/lib/client/lib/userRoles.js | 6 +- app/lib/client/methods/sendMessage.js | 8 +- app/lib/client/views/customFieldsForm.js | 2 +- app/lib/lib/MessageTypes.js | 4 +- app/lib/lib/roomTypes/conversation.js | 2 +- app/lib/lib/roomTypes/direct.js | 10 +- app/lib/lib/roomTypes/favorite.js | 4 +- app/lib/lib/roomTypes/private.js | 10 +- app/lib/lib/roomTypes/public.js | 10 +- app/lib/lib/roomTypes/unread.js | 2 +- app/lib/lib/startup/settingsOnLoadSiteUrl.js | 2 +- .../functions/addUserToDefaultChannels.js | 6 +- app/lib/server/functions/addUserToRoom.js | 6 +- app/lib/server/functions/archiveRoom.js | 4 +- app/lib/server/functions/attachMessage.js | 4 +- .../functions/checkUsernameAvailability.js | 2 +- app/lib/server/functions/cleanRoomHistory.js | 6 +- app/lib/server/functions/createRoom.js | 10 +- app/lib/server/functions/deleteMessage.js | 12 +- app/lib/server/functions/deleteRoom.js | 4 +- app/lib/server/functions/deleteUser.js | 10 +- .../functions/getAvatarSuggestionForUser.js | 2 +- app/lib/server/functions/getFullUserData.js | 8 +- .../getRoomByNameOrIdWithOptionToJoin.js | 2 +- .../server/functions/getUsernameSuggestion.js | 4 +- app/lib/server/functions/insertMessage.js | 4 +- app/lib/server/functions/isTheLastMessage.js | 2 +- .../server/functions/loadMessageHistory.js | 6 +- .../server/functions/notifications/audio.js | 6 +- .../server/functions/notifications/desktop.js | 8 +- .../server/functions/notifications/email.js | 10 +- .../server/functions/notifications/index.js | 2 +- .../server/functions/notifications/mobile.js | 8 +- .../server/functions/processWebhookMessage.js | 2 +- .../server/functions/removeUserFromRoom.js | 4 +- app/lib/server/functions/saveCustomFields.js | 2 +- .../saveCustomFieldsWithoutValidation.js | 4 +- app/lib/server/functions/saveUser.js | 6 +- app/lib/server/functions/sendMessage.js | 10 +- app/lib/server/functions/setEmail.js | 4 +- app/lib/server/functions/setRealName.js | 8 +- app/lib/server/functions/setUserAvatar.js | 8 +- app/lib/server/functions/setUsername.js | 8 +- app/lib/server/functions/unarchiveRoom.js | 2 +- app/lib/server/functions/updateMessage.js | 8 +- .../server/functions/validateCustomFields.js | 2 +- app/lib/server/lib/bugsnag.js | 4 +- app/lib/server/lib/configLogger.js | 4 +- app/lib/server/lib/debug.js | 6 +- .../server/lib/interceptDirectReplyEmails.js | 2 +- app/lib/server/lib/notifyUsersOnMessage.js | 6 +- app/lib/server/lib/passwordPolicy.js | 2 +- app/lib/server/lib/processDirectEmail.js | 6 +- .../server/lib/sendNotificationsOnMessage.js | 12 +- app/lib/server/lib/validateEmailDomain.js | 2 +- app/lib/server/methods/addOAuthService.js | 4 +- app/lib/server/methods/addUsersToRoom.js | 4 +- app/lib/server/methods/archiveRoom.js | 4 +- app/lib/server/methods/blockUser.js | 2 +- .../methods/checkRegistrationSecretURL.js | 2 +- .../methods/checkUsernameAvailability.js | 2 +- app/lib/server/methods/cleanRoomHistory.js | 2 +- app/lib/server/methods/createChannel.js | 2 +- app/lib/server/methods/createPrivateGroup.js | 2 +- app/lib/server/methods/createToken.js | 2 +- app/lib/server/methods/deleteMessage.js | 6 +- .../server/methods/deleteUserOwnAccount.js | 4 +- .../methods/executeSlashCommandPreview.js | 2 +- app/lib/server/methods/filterATAllTag.js | 8 +- app/lib/server/methods/filterATHereTag.js | 8 +- app/lib/server/methods/filterBadWords.js | 4 +- app/lib/server/methods/getChannelHistory.js | 8 +- app/lib/server/methods/getRoomJoinCode.js | 4 +- .../server/methods/getRoomMessageMetadata.js | 2 +- app/lib/server/methods/getRoomRoles.js | 4 +- app/lib/server/methods/getServerInfo.js | 2 +- app/lib/server/methods/getSingleMessage.js | 2 +- .../server/methods/getSlashCommandPreviews.js | 2 +- app/lib/server/methods/getUserRoles.js | 2 +- app/lib/server/methods/joinRoom.js | 6 +- app/lib/server/methods/leaveRoom.js | 4 +- app/lib/server/methods/refreshOAuthService.js | 4 +- app/lib/server/methods/removeOAuthService.js | 4 +- app/lib/server/methods/restartServer.js | 2 +- app/lib/server/methods/robotMethods.js | 4 +- app/lib/server/methods/saveSetting.js | 6 +- app/lib/server/methods/saveSettings.js | 6 +- app/lib/server/methods/sendInvitationEmail.js | 6 +- app/lib/server/methods/sendMessage.js | 12 +- app/lib/server/methods/sendSMTPTestEmail.js | 4 +- app/lib/server/methods/setAdminStatus.js | 2 +- app/lib/server/methods/setEmail.js | 2 +- app/lib/server/methods/setRealName.js | 2 +- app/lib/server/methods/setUsername.js | 6 +- app/lib/server/methods/unarchiveRoom.js | 4 +- app/lib/server/methods/unblockUser.js | 2 +- app/lib/server/methods/updateMessage.js | 6 +- app/lib/server/oauth/proxy.js | 2 +- app/lib/server/publications/settings.js | 6 +- app/lib/server/startup/email.js | 2 +- app/lib/server/startup/oAuthServicesUpdate.js | 6 +- app/lib/server/startup/rateLimiter.js | 4 +- app/lib/server/startup/robots.js | 2 +- app/lib/server/startup/settings.js | 2 +- .../server/startup/settingsOnLoadCdnPrefix.js | 2 +- .../startup/settingsOnLoadDirectReply.js | 2 +- app/lib/server/startup/settingsOnLoadSMTP.js | 2 +- app/lib/startup/defaultRoomTypes.js | 2 +- app/lib/startup/index.js | 4 +- app/livechat/client/lib/dateHandler.js | 2 +- app/livechat/client/roomType.js | 2 +- app/livechat/client/route.js | 2 +- .../client/startup/notifyUnreadRooms.js | 6 +- app/livechat/client/ui.js | 6 +- .../views/app/analytics/livechatAnalytics.js | 4 +- .../livechatAnalyticsCustomDaterange.js | 4 +- .../analytics/livechatAnalyticsDaterange.js | 2 +- .../livechatIntegrationFacebook.js | 4 +- .../livechatIntegrationWebhook.js | 4 +- .../client/views/app/livechatAppearance.js | 2 +- .../client/views/app/livechatCurrentChats.js | 4 +- .../views/app/livechatCustomFieldForm.js | 2 +- .../client/views/app/livechatCustomFields.js | 4 +- .../views/app/livechatDepartmentForm.js | 2 +- .../client/views/app/livechatDepartments.js | 4 +- .../client/views/app/livechatInstallation.js | 2 +- .../client/views/app/livechatOfficeHours.js | 4 +- .../client/views/app/livechatQueue.js | 6 +- .../client/views/app/livechatTriggers.js | 4 +- .../client/views/app/livechatTriggersForm.js | 2 +- .../client/views/app/livechatUsers.js | 4 +- .../client/views/app/tabbar/visitorEdit.js | 4 +- .../client/views/app/tabbar/visitorForward.js | 4 +- .../client/views/app/tabbar/visitorHistory.js | 2 +- .../client/views/app/tabbar/visitorInfo.js | 10 +- .../views/app/tabbar/visitorNavigation.js | 4 +- .../app/triggers/livechatTriggerAction.js | 2 +- app/livechat/client/views/sideNav/livechat.js | 14 +- .../client/views/sideNav/livechatFlex.js | 4 +- .../imports/server/rest/departments.js | 6 +- app/livechat/imports/server/rest/facebook.js | 6 +- app/livechat/imports/server/rest/sms.js | 6 +- app/livechat/imports/server/rest/upload.js | 10 +- app/livechat/imports/server/rest/users.js | 6 +- app/livechat/lib/LivechatExternalMessage.js | 2 +- app/livechat/lib/LivechatInquiry.js | 2 +- app/livechat/lib/LivechatRoomType.js | 10 +- app/livechat/lib/messageTypes.js | 10 +- app/livechat/server/agentStatus.js | 2 +- app/livechat/server/api/lib/livechat.js | 2 +- app/livechat/server/api/v1/agent.js | 2 +- app/livechat/server/api/v1/config.js | 4 +- app/livechat/server/api/v1/customField.js | 2 +- app/livechat/server/api/v1/message.js | 8 +- app/livechat/server/api/v1/offlineMessage.js | 2 +- app/livechat/server/api/v1/pageVisited.js | 2 +- app/livechat/server/api/v1/room.js | 6 +- app/livechat/server/api/v1/transcript.js | 2 +- app/livechat/server/api/v1/videoCall.js | 6 +- app/livechat/server/api/v1/visitor.js | 6 +- app/livechat/server/config.js | 2 +- app/livechat/server/hooks/RDStation.js | 4 +- app/livechat/server/hooks/externalMessage.js | 6 +- app/livechat/server/hooks/leadCapture.js | 6 +- .../server/hooks/markRoomResponded.js | 4 +- app/livechat/server/hooks/offlineMessage.js | 4 +- .../server/hooks/saveAnalyticsData.js | 4 +- app/livechat/server/hooks/sendToCRM.js | 6 +- app/livechat/server/hooks/sendToFacebook.js | 4 +- app/livechat/server/lib/Analytics.js | 2 +- app/livechat/server/lib/Livechat.js | 14 +- app/livechat/server/lib/OfficeClock.js | 4 +- app/livechat/server/lib/OmniChannel.js | 2 +- app/livechat/server/lib/QueueMethods.js | 6 +- app/livechat/server/livechat.js | 2 +- app/livechat/server/methods/addAgent.js | 2 +- app/livechat/server/methods/addManager.js | 2 +- .../server/methods/changeLivechatStatus.js | 2 +- app/livechat/server/methods/closeByVisitor.js | 4 +- app/livechat/server/methods/closeRoom.js | 4 +- app/livechat/server/methods/facebook.js | 4 +- app/livechat/server/methods/getAgentData.js | 2 +- .../server/methods/getAgentOverviewData.js | 2 +- .../server/methods/getAnalyticsChartData.js | 2 +- .../methods/getAnalyticsOverviewData.js | 2 +- .../server/methods/getCustomFields.js | 2 +- app/livechat/server/methods/getInitialData.js | 2 +- app/livechat/server/methods/getNextAgent.js | 2 +- app/livechat/server/methods/loadHistory.js | 4 +- app/livechat/server/methods/loginByToken.js | 2 +- app/livechat/server/methods/registerGuest.js | 2 +- app/livechat/server/methods/removeAgent.js | 2 +- .../server/methods/removeCustomField.js | 4 +- .../server/methods/removeDepartment.js | 2 +- app/livechat/server/methods/removeManager.js | 2 +- app/livechat/server/methods/removeRoom.js | 4 +- app/livechat/server/methods/removeTrigger.js | 4 +- .../server/methods/returnAsInquiry.js | 2 +- app/livechat/server/methods/saveAppearance.js | 4 +- .../server/methods/saveCustomField.js | 4 +- app/livechat/server/methods/saveDepartment.js | 2 +- app/livechat/server/methods/saveInfo.js | 6 +- .../server/methods/saveIntegration.js | 4 +- .../server/methods/saveOfficeHours.js | 2 +- .../server/methods/saveSurveyFeedback.js | 2 +- app/livechat/server/methods/saveTrigger.js | 4 +- app/livechat/server/methods/searchAgent.js | 4 +- .../server/methods/sendFileLivechatMessage.js | 4 +- .../server/methods/sendMessageLivechat.js | 2 +- app/livechat/server/methods/setCustomField.js | 2 +- .../server/methods/setDepartmentForVisitor.js | 2 +- .../server/methods/startFileUploadRoom.js | 2 +- app/livechat/server/methods/startVideoCall.js | 4 +- app/livechat/server/methods/takeInquiry.js | 4 +- app/livechat/server/methods/transfer.js | 4 +- app/livechat/server/methods/webhookTest.js | 2 +- app/livechat/server/permissions.js | 2 +- .../server/publications/customFields.js | 4 +- .../server/publications/departmentAgents.js | 4 +- .../server/publications/livechatAgents.js | 2 +- .../server/publications/livechatAppearance.js | 4 +- .../publications/livechatDepartments.js | 4 +- .../server/publications/livechatInquiries.js | 2 +- .../publications/livechatIntegration.js | 4 +- .../server/publications/livechatManagers.js | 2 +- .../server/publications/livechatMonitoring.js | 4 +- .../publications/livechatOfficeHours.js | 4 +- .../server/publications/livechatQueue.js | 4 +- .../server/publications/livechatRooms.js | 4 +- .../server/publications/livechatTriggers.js | 4 +- .../server/publications/livechatVisitors.js | 4 +- .../server/publications/visitorHistory.js | 4 +- .../server/publications/visitorInfo.js | 4 +- .../server/publications/visitorPageVisited.js | 4 +- app/livechat/server/roomType.js | 6 +- app/livechat/server/sendMessageBySMS.js | 8 +- app/livechat/server/startup.js | 10 +- app/livechat/server/unclosedLivechats.js | 4 +- app/livestream/client/oauth.js | 2 +- app/livestream/client/tabBar.js | 6 +- app/livestream/client/views/broadcastView.js | 4 +- app/livestream/client/views/liveStreamTab.js | 14 +- app/livestream/server/methods.js | 4 +- app/livestream/server/routes.js | 6 +- app/livestream/server/settings.js | 2 +- app/logger/client/viewLogs.js | 6 +- app/logger/client/views/viewLogs.js | 4 +- app/logger/server/server.js | 4 +- app/mail-messages/client/startup.js | 4 +- app/mail-messages/client/views/mailer.js | 4 +- .../server/functions/sendMail.js | 4 +- .../server/functions/unsubscribe.js | 2 +- app/mail-messages/server/methods/sendMail.js | 2 +- app/mail-messages/server/startup.js | 2 +- app/mailer/server/api.js | 2 +- app/mapview/client/mapview.js | 4 +- app/mapview/server/settings.js | 2 +- app/markdown/lib/markdown.js | 4 +- app/markdown/lib/parser/marked/marked.js | 2 +- app/markdown/lib/parser/original/markdown.js | 2 +- app/markdown/server/settings.js | 2 +- app/markdown/tests/client.mocks.js | 4 +- app/mentions-flextab/client/actionButton.js | 2 +- app/mentions-flextab/client/tabBar.js | 2 +- .../server/publications/mentionedMessages.js | 2 +- app/mentions/client/client.js | 4 +- .../methods/getUserMentionsByChannel.js | 2 +- app/mentions/server/server.js | 8 +- .../client/messageAttachment.js | 8 +- .../client/actionButton.js | 6 +- app/message-mark-as-unread/server/logger.js | 2 +- .../server/unreadMessages.js | 2 +- app/message-pin/client/actionButton.js | 10 +- app/message-pin/client/messageType.js | 2 +- app/message-pin/client/pinMessage.js | 4 +- app/message-pin/client/tabBar.js | 4 +- app/message-pin/server/pinMessage.js | 12 +- .../server/publications/pinnedMessages.js | 2 +- app/message-pin/server/settings.js | 4 +- app/message-pin/server/startup/indexes.js | 2 +- app/message-snippet/client/actionButton.js | 10 +- app/message-snippet/client/messageType.js | 2 +- .../client/page/snippetPage.js | 6 +- app/message-snippet/client/router.js | 2 +- app/message-snippet/client/snippetMessage.js | 4 +- app/message-snippet/client/tabBar/tabBar.js | 4 +- .../server/methods/snippetMessage.js | 8 +- .../server/publications/snippetedMessage.js | 2 +- .../publications/snippetedMessagesByRoom.js | 2 +- app/message-snippet/server/requests.js | 2 +- .../server/startup/settings.js | 4 +- app/message-star/client/actionButton.js | 8 +- app/message-star/client/starMessage.js | 4 +- app/message-star/client/tabBar.js | 2 +- .../server/publications/starredMessages.js | 2 +- app/message-star/server/settings.js | 2 +- app/message-star/server/starMessage.js | 6 +- app/message-star/server/startup/indexes.js | 2 +- .../server/saml_rocketchat.js | 4 +- .../server/saml_server.js | 4 +- app/metrics/server/callbacksMetrics.js | 2 +- app/metrics/server/lib/metrics.js | 8 +- app/migrations/server/migrations.js | 2 +- app/models/client/models/CachedChatRoom.js | 2 +- .../client/models/CachedChatSubscription.js | 2 +- app/models/client/models/ChatPermissions.js | 2 +- app/models/server/models/Messages.js | 4 +- app/models/server/models/Subscriptions.js | 2 +- app/models/server/models/Users.js | 2 +- app/models/server/models/_BaseDb.js | 2 +- app/notifications/server/lib/Notifications.js | 4 +- .../client/admin/route.js | 2 +- .../client/admin/startup.js | 4 +- .../client/admin/views/oauthApp.js | 6 +- .../client/admin/views/oauthApps.js | 2 +- .../server/admin/methods/addOAuthApp.js | 4 +- .../server/admin/methods/deleteOAuthApp.js | 4 +- .../server/admin/methods/updateOAuthApp.js | 4 +- .../server/admin/publications/oauthApps.js | 4 +- .../server/oauth/default-services.js | 2 +- .../server/oauth/oauth2-server.js | 4 +- app/oembed/client/oembedAudioWidget.js | 2 +- app/oembed/client/oembedFrameWidget.js | 2 +- app/oembed/client/oembedImageWidget.js | 2 +- app/oembed/client/oembedUrlWidget.js | 2 +- app/oembed/client/oembedVideoWidget.js | 2 +- app/oembed/client/oembedYoutubeWidget.js | 2 +- app/oembed/server/jumpToMessage.js | 8 +- app/oembed/server/providers.js | 2 +- app/oembed/server/server.js | 6 +- app/otr/client/rocketchat.otr.js | 8 +- app/otr/client/rocketchat.otr.room.js | 4 +- app/otr/client/tabBar.js | 4 +- app/otr/client/views/otrFlexTab.js | 2 +- .../server/methods/deleteOldOTRMessages.js | 2 +- app/otr/server/methods/updateOTRAck.js | 2 +- app/otr/server/settings.js | 2 +- app/push-notifications/client/tabBar.js | 2 +- .../client/views/pushNotificationsFlexTab.js | 10 +- .../server/lib/PushNotification.js | 6 +- .../methods/saveNotificationSettings.js | 4 +- app/reactions/client/init.js | 8 +- app/reactions/client/methods/setReaction.js | 6 +- app/reactions/server/setReaction.js | 10 +- .../server/cronPruneMessages.js | 6 +- .../server/startup/settings.js | 2 +- app/search/client/provider/result.js | 2 +- app/search/server/events/events.js | 4 +- app/search/server/logger/logger.js | 2 +- app/search/server/model/provider.js | 2 +- app/search/server/service/providerService.js | 2 +- .../server/service/validationService.js | 2 +- app/settings/client/lib/settings.js | 2 +- app/settings/server/functions/settings.js | 2 +- app/setup-wizard/client/final.js | 6 +- app/setup-wizard/client/setupWizard.js | 10 +- .../server/getSetupWizardParameters.js | 4 +- .../client/slackbridge_import.client.js | 4 +- app/slackbridge/server/RocketAdapter.js | 8 +- app/slackbridge/server/SlackAdapter.js | 12 +- app/slackbridge/server/logger.js | 2 +- app/slackbridge/server/settings.js | 2 +- app/slackbridge/server/slackbridge.js | 2 +- .../server/slackbridge_import.server.js | 6 +- app/slashcommand-asciiarts/lib/gimme.js | 2 +- app/slashcommand-asciiarts/lib/lenny.js | 2 +- app/slashcommand-asciiarts/lib/shrug.js | 2 +- app/slashcommand-asciiarts/lib/tableflip.js | 2 +- app/slashcommand-asciiarts/lib/unflip.js | 2 +- .../client/client.js | 2 +- .../server/server.js | 6 +- app/slashcommands-create/client/client.js | 2 +- app/slashcommands-create/server/server.js | 8 +- app/slashcommands-help/server/server.js | 4 +- app/slashcommands-hide/client/hide.js | 2 +- app/slashcommands-hide/server/hide.js | 6 +- app/slashcommands-invite/client/client.js | 2 +- app/slashcommands-invite/server/server.js | 6 +- app/slashcommands-inviteall/client/client.js | 2 +- app/slashcommands-inviteall/server/server.js | 8 +- app/slashcommands-join/client/client.js | 2 +- app/slashcommands-join/server/server.js | 6 +- app/slashcommands-kick/client/client.js | 2 +- app/slashcommands-kick/server/server.js | 6 +- app/slashcommands-leave/server/leave.js | 4 +- app/slashcommands-me/server/me.js | 2 +- app/slashcommands-msg/server/server.js | 6 +- app/slashcommands-mute/server/mute.js | 6 +- app/slashcommands-mute/server/unmute.js | 6 +- app/slashcommands-open/client/client.js | 4 +- app/slashcommands-topic/lib/topic.js | 8 +- .../client/client.js | 2 +- .../server/server.js | 6 +- .../server/functions/generateEml.js | 6 +- .../server/functions/sendEmail.js | 6 +- app/smarsh-connector/server/settings.js | 2 +- app/smarsh-connector/server/startup.js | 2 +- app/sms/server/SMS.js | 2 +- app/sms/server/services/twilio.js | 2 +- app/sms/server/settings.js | 2 +- app/spotify/lib/spotify.js | 2 +- app/statistics/server/functions/get.js | 8 +- app/statistics/server/functions/save.js | 2 +- app/statistics/server/lib/SAUMonitor.js | 4 +- .../server/methods/getStatistics.js | 4 +- app/theme/server/server.js | 4 +- app/theme/server/variables.js | 2 +- .../client/createThreadMessageAction.js | 8 +- .../client/lib/messageTypes/threadMessage.js | 2 +- app/threading/client/tabBar.js | 2 +- app/threading/client/threadFromMessageBox.js | 4 +- app/threading/client/views/ThreadList.js | 6 +- .../views/creationDialog/CreateThread.js | 8 +- .../views/fieldTypeThreadLastMessageAge.js | 2 +- .../views/fieldTypeThreadReplyCounter.js | 2 +- app/threading/lib/threadRoomType.js | 2 +- app/threading/server/authorization.js | 4 +- app/threading/server/config.js | 2 +- .../server/hooks/joinThreadOnMessage.js | 4 +- .../server/hooks/propagateThreadMetadata.js | 6 +- app/threading/server/methods/createThread.js | 8 +- app/threading/server/permissions.js | 2 +- .../publications/threadParentAutocomplete.js | 4 +- .../server/publications/threadsOfRoom.js | 2 +- app/tokenpass/client/roomType.js | 2 +- app/tokenpass/client/startup.js | 4 +- app/tokenpass/client/tokenChannelsList.js | 2 +- .../client/tokenpassChannelSettings.js | 4 +- app/tokenpass/lib/common.js | 4 +- app/tokenpass/server/cronRemoveUsers.js | 4 +- .../getProtectedTokenpassBalances.js | 2 +- .../functions/getPublicTokenpassBalances.js | 2 +- .../functions/saveRoomTokensMinimumBalance.js | 2 +- .../functions/updateUserTokenpassBalances.js | 2 +- .../server/methods/findTokenChannels.js | 2 +- .../server/methods/getChannelTokenpass.js | 2 +- app/tokenpass/server/startup.js | 8 +- app/ui-account/client/account.js | 2 +- app/ui-account/client/accountFlex.js | 8 +- app/ui-account/client/accountIntegrations.js | 6 +- app/ui-account/client/accountPreferences.js | 10 +- app/ui-account/client/accountProfile.js | 10 +- app/ui-account/client/avatar/avatar.js | 2 +- app/ui-account/client/avatar/prompt.js | 10 +- app/ui-admin/client/admin.js | 8 +- app/ui-admin/client/adminFlex.js | 8 +- app/ui-admin/client/adminInfo.js | 6 +- app/ui-admin/client/rooms/adminRoomInfo.js | 12 +- app/ui-admin/client/rooms/adminRooms.js | 8 +- .../client/rooms/channelSettingsDefault.js | 2 +- app/ui-admin/client/users/adminInviteUser.js | 4 +- app/ui-admin/client/users/adminUsers.js | 2 +- .../server/publications/adminRooms.js | 4 +- .../client/models/CachedCollection.js | 8 +- app/ui-clean-history/client/lib/startup.js | 4 +- .../client/views/cleanHistory.js | 8 +- app/ui-flextab/client/flexTabBar.js | 6 +- app/ui-flextab/client/tabs/inviteUsers.js | 4 +- app/ui-flextab/client/tabs/membersList.js | 10 +- .../client/tabs/uploadedFilesList.js | 6 +- app/ui-flextab/client/tabs/userActions.js | 12 +- app/ui-flextab/client/tabs/userEdit.js | 6 +- app/ui-flextab/client/tabs/userInfo.js | 10 +- app/ui-login/client/login/footer.js | 2 +- app/ui-login/client/login/form.js | 6 +- app/ui-login/client/login/header.js | 2 +- app/ui-login/client/login/layout.js | 2 +- app/ui-login/client/login/services.js | 2 +- .../client/reset-password/resetPassword.js | 8 +- app/ui-login/client/username/layout.js | 2 +- app/ui-login/client/username/username.js | 6 +- app/ui-master/client/main.js | 16 +- app/ui-master/server/inject.js | 4 +- app/ui-message/client/message.js | 20 +- app/ui-message/client/messageBox.js | 16 +- .../client/messageBoxAudioMessage.js | 8 +- .../client/messageBoxNotSubscribed.js | 8 +- app/ui-message/client/messageBoxTyping.js | 4 +- app/ui-message/client/popup/messagePopup.js | 4 +- .../client/popup/messagePopupChannel.js | 2 +- .../client/popup/messagePopupConfig.js | 10 +- .../popup/messagePopupSlashCommandPreview.js | 6 +- .../client/startup/messageBoxActions.js | 10 +- app/ui-message/client/startup/restoreText.js | 6 +- app/ui-sidenav/client/chatRoomItem.js | 10 +- app/ui-sidenav/client/roomList.js | 8 +- app/ui-sidenav/client/sideNav.js | 10 +- app/ui-sidenav/client/sidebarHeader.js | 14 +- app/ui-sidenav/client/sidebarItem.js | 12 +- app/ui-sidenav/client/sortlist.js | 6 +- app/ui-sidenav/client/toolbar.js | 8 +- app/ui-utils/client/lib/ChannelActions.js | 2 +- app/ui-utils/client/lib/IframeLogin.js | 2 +- app/ui-utils/client/lib/MessageAction.js | 10 +- app/ui-utils/client/lib/RoomHistoryManager.js | 2 +- app/ui-utils/client/lib/RoomManager.js | 12 +- app/ui-utils/client/lib/SideNav.js | 4 +- app/ui-utils/client/lib/avatar.js | 2 +- app/ui-utils/client/lib/callMethod.js | 2 +- app/ui-utils/client/lib/fireGlobalEvent.js | 2 +- app/ui-utils/client/lib/menu.js | 4 +- app/ui-utils/client/lib/modal.js | 2 +- app/ui-utils/client/lib/openRoom.js | 8 +- app/ui-utils/client/lib/popout.js | 2 +- app/ui-utils/client/lib/popover.js | 4 +- app/ui-utils/client/lib/readMessages.js | 2 +- app/ui-utils/client/lib/renderMessageBody.js | 2 +- app/ui-utils/lib/Message.js | 2 +- app/ui-utils/lib/MessageProperties.js | 2 +- app/ui-vrecord/client/VRecDialog.js | 2 +- app/ui-vrecord/client/vrecord.js | 2 +- app/ui-vrecord/server/settings.js | 2 +- app/ui/client/components/header/header.js | 2 +- app/ui/client/components/header/headerRoom.js | 16 +- app/ui/client/components/icon.js | 2 +- app/ui/client/components/popupList.js | 2 +- app/ui/client/lib/accounts.js | 2 +- app/ui/client/lib/chatMessages.js | 16 +- app/ui/client/lib/collections.js | 4 +- app/ui/client/lib/esc.js | 4 +- app/ui/client/lib/fileUpload.js | 6 +- app/ui/client/lib/iframeCommands.js | 6 +- app/ui/client/lib/menu.js | 2 +- app/ui/client/lib/msgTyping.js | 4 +- app/ui/client/lib/notification.js | 12 +- app/ui/client/lib/recorderjs/audioEncoder.js | 2 +- app/ui/client/views/app/burger.js | 2 +- app/ui/client/views/app/createChannel.js | 8 +- app/ui/client/views/app/directory.js | 6 +- app/ui/client/views/app/home.js | 2 +- app/ui/client/views/app/room.js | 18 +- app/ui/client/views/app/roomSearch.js | 2 +- app/ui/client/views/app/secretURL.js | 2 +- .../views/app/videoCall/videoButtons.js | 2 +- .../client/views/app/videoCall/videoCall.js | 4 +- app/ui/client/views/cmsPage.js | 2 +- .../server/cronProcessDownloads.js | 8 +- .../server/startup/settings.js | 2 +- app/utils/client/lib/CustomTranslations.js | 2 +- app/utils/client/lib/roomTypes.js | 2 +- app/utils/lib/RoomTypeConfig.js | 4 +- app/utils/lib/fileUploadRestrictions.js | 2 +- app/utils/lib/getAvatarUrlFromUsername.js | 2 +- app/utils/lib/getURL.js | 2 +- .../lib/getUserNotificationPreference.js | 4 +- app/utils/lib/getUserPreference.js | 4 +- app/utils/lib/getValidRoomName.js | 4 +- app/utils/lib/placeholders.js | 2 +- app/utils/lib/roomExit.js | 2 +- app/utils/lib/templateVarHandler.js | 2 +- .../lib/composeMessageObjectWithUser.js | 4 +- app/version-check/client/client.js | 2 +- app/version-check/server/addSettings.js | 2 +- .../server/functions/checkVersionUpdate.js | 6 +- .../server/functions/getNewUpdates.js | 8 +- app/version-check/server/logger.js | 2 +- .../server/methods/banner_dismiss.js | 2 +- app/videobridge/client/actionLink.js | 4 +- app/videobridge/client/tabBar.js | 6 +- app/videobridge/client/views/videoFlexTab.js | 6 +- .../client/views/videoFlexTabBbb.js | 8 +- app/videobridge/lib/messageType.js | 2 +- app/videobridge/server/actionLink.js | 2 +- app/videobridge/server/methods/bbb.js | 10 +- .../server/methods/jitsiSetTimeout.js | 4 +- app/videobridge/server/settings.js | 2 +- app/webdav/client/actionButton.js | 8 +- app/webdav/client/addWebdavAccount.js | 4 +- app/webdav/client/selectWebdavAccount.js | 6 +- .../client/startup/messageBoxActions.js | 8 +- app/webdav/client/webdavFilePicker.js | 6 +- app/webdav/server/methods/addWebdavAccount.js | 4 +- .../server/methods/getFileFromWebdav.js | 4 +- .../server/methods/getWebdavFileList.js | 4 +- .../server/methods/removeWebdavAccount.js | 2 +- .../server/methods/uploadFileToWebdav.js | 4 +- .../server/publications/webdavAccounts.js | 2 +- app/webdav/server/startup/settings.js | 2 +- app/webrtc/client/WebRTCClass.js | 10 +- app/webrtc/client/screenShare.js | 2 +- app/webrtc/server/settings.js | 2 +- app/wordpress/lib/common.js | 4 +- app/wordpress/server/startup.js | 2 +- client/importPackages.js | 222 ++++++++-------- client/importsCss.js | 84 +++---- client/methods/deleteMessage.js | 6 +- client/methods/hideRoom.js | 2 +- client/methods/openRoom.js | 2 +- client/methods/toggleFavorite.js | 2 +- client/methods/updateMessage.js | 10 +- client/notifications/UsersNameChanged.js | 4 +- client/notifications/notification.js | 10 +- client/notifications/updateAvatar.js | 4 +- client/notifications/updateUserState.js | 4 +- client/routes/roomRoute.js | 6 +- client/routes/router.js | 2 +- client/startup/emailVerification.js | 2 +- client/startup/i18n.js | 6 +- client/startup/roomObserve.js | 2 +- client/startup/startup.js | 8 +- client/startup/unread.js | 10 +- client/startup/userSetUtcOffset.js | 2 +- client/startup/usersObserve.js | 2 +- imports/message-read-receipt/client/main.js | 2 +- .../message-read-receipt/client/message.js | 2 +- .../client/readReceipts.js | 2 +- imports/message-read-receipt/client/room.js | 6 +- .../server/api/methods/getReadReceipts.js | 2 +- imports/message-read-receipt/server/hooks.js | 4 +- .../server/lib/ReadReceipt.js | 4 +- .../message-read-receipt/server/settings.js | 2 +- .../client/personalAccessTokens.js | 6 +- .../server/api/methods/generateToken.js | 4 +- .../server/api/methods/regenerateToken.js | 4 +- .../server/api/methods/removeToken.js | 4 +- .../publications/personalAccessTokens.js | 4 +- server/configuration/accounts_meld.js | 2 +- server/importPackages.js | 238 +++++++++--------- server/lib/accounts.js | 10 +- server/lib/cordova.js | 8 +- server/lib/roomFiles.js | 2 +- server/methods/OEmbedCacheCleanup.js | 6 +- server/methods/addAllUserToRoom.js | 8 +- server/methods/addRoomLeader.js | 8 +- server/methods/addRoomModerator.js | 8 +- server/methods/addRoomOwner.js | 8 +- server/methods/afterVerifyEmail.js | 2 +- server/methods/browseChannels.js | 6 +- server/methods/canAccessRoom.js | 6 +- server/methods/channelsList.js | 8 +- server/methods/createDirectMessage.js | 12 +- server/methods/deleteFileMessage.js | 4 +- server/methods/deleteUser.js | 6 +- server/methods/eraseRoom.js | 10 +- server/methods/getAvatarSuggestion.js | 2 +- server/methods/getRoomById.js | 4 +- server/methods/getRoomIdByNameOrId.js | 4 +- server/methods/getRoomNameById.js | 4 +- server/methods/getTotalChannels.js | 2 +- server/methods/getUsersOfRoom.js | 4 +- server/methods/hideRoom.js | 2 +- server/methods/ignoreUser.js | 2 +- server/methods/loadHistory.js | 8 +- server/methods/loadMissedMessages.js | 4 +- server/methods/loadNextMessages.js | 6 +- server/methods/loadSurroundingMessages.js | 6 +- server/methods/logoutCleanUp.js | 2 +- server/methods/messageSearch.js | 4 +- server/methods/migrate.js | 4 +- server/methods/muteUserInRoom.js | 6 +- server/methods/openRoom.js | 2 +- server/methods/readMessages.js | 4 +- server/methods/registerUser.js | 8 +- server/methods/removeRoomLeader.js | 8 +- server/methods/removeRoomModerator.js | 8 +- server/methods/removeRoomOwner.js | 8 +- server/methods/removeUserFromRoom.js | 6 +- server/methods/reportMessage.js | 2 +- server/methods/requestDataDownload.js | 4 +- server/methods/resetAvatar.js | 8 +- server/methods/roomNameExists.js | 2 +- server/methods/saveUserPreferences.js | 2 +- server/methods/saveUserProfile.js | 6 +- server/methods/sendConfirmationEmail.js | 6 +- server/methods/sendForgotPasswordEmail.js | 6 +- server/methods/setAvatarFromService.js | 4 +- server/methods/setUserActiveStatus.js | 8 +- server/methods/setUserPassword.js | 4 +- server/methods/toogleFavorite.js | 2 +- server/methods/unmuteUserInRoom.js | 6 +- server/methods/userSetUtcOffset.js | 2 +- server/publications/activeUsers.js | 2 +- .../channelAndPrivateAutocomplete.js | 4 +- server/publications/fullUserData.js | 2 +- server/publications/messages.js | 4 +- server/publications/room.js | 10 +- .../publications/roomSubscriptionsByRole.js | 4 +- server/publications/spotlight.js | 8 +- server/publications/subscription.js | 4 +- server/publications/userAutocomplete.js | 2 +- server/publications/userChannels.js | 4 +- server/publications/userData.js | 2 +- server/startup/avatar.js | 8 +- server/startup/cron.js | 8 +- server/startup/initialData.js | 12 +- server/startup/migrations/v001.js | 6 +- server/startup/migrations/v002.js | 10 +- server/startup/migrations/v003.js | 4 +- server/startup/migrations/v004.js | 4 +- server/startup/migrations/v005.js | 4 +- server/startup/migrations/v006.js | 4 +- server/startup/migrations/v007.js | 6 +- server/startup/migrations/v008.js | 4 +- server/startup/migrations/v009.js | 4 +- server/startup/migrations/v010.js | 4 +- server/startup/migrations/v011.js | 4 +- server/startup/migrations/v012.js | 4 +- server/startup/migrations/v013.js | 4 +- server/startup/migrations/v014.js | 4 +- server/startup/migrations/v015.js | 4 +- server/startup/migrations/v016.js | 4 +- server/startup/migrations/v017.js | 4 +- server/startup/migrations/v018.js | 4 +- server/startup/migrations/v019.js | 6 +- server/startup/migrations/v020.js | 4 +- server/startup/migrations/v021.js | 4 +- server/startup/migrations/v022.js | 4 +- server/startup/migrations/v023.js | 4 +- server/startup/migrations/v024.js | 4 +- server/startup/migrations/v025.js | 4 +- server/startup/migrations/v026.js | 4 +- server/startup/migrations/v027.js | 4 +- server/startup/migrations/v028.js | 4 +- server/startup/migrations/v029.js | 4 +- server/startup/migrations/v030.js | 4 +- server/startup/migrations/v031.js | 4 +- server/startup/migrations/v032.js | 4 +- server/startup/migrations/v033.js | 4 +- server/startup/migrations/v034.js | 4 +- server/startup/migrations/v035.js | 4 +- server/startup/migrations/v036.js | 6 +- server/startup/migrations/v037.js | 4 +- server/startup/migrations/v038.js | 6 +- server/startup/migrations/v039.js | 4 +- server/startup/migrations/v040.js | 4 +- server/startup/migrations/v041.js | 4 +- server/startup/migrations/v042.js | 6 +- server/startup/migrations/v043.js | 4 +- server/startup/migrations/v044.js | 4 +- server/startup/migrations/v045.js | 6 +- server/startup/migrations/v046.js | 4 +- server/startup/migrations/v047.js | 4 +- server/startup/migrations/v048.js | 4 +- server/startup/migrations/v049.js | 4 +- server/startup/migrations/v050.js | 4 +- server/startup/migrations/v051.js | 4 +- server/startup/migrations/v052.js | 4 +- server/startup/migrations/v053.js | 4 +- server/startup/migrations/v054.js | 4 +- server/startup/migrations/v055.js | 4 +- server/startup/migrations/v056.js | 4 +- server/startup/migrations/v057.js | 4 +- server/startup/migrations/v058.js | 4 +- server/startup/migrations/v059.js | 4 +- server/startup/migrations/v060.js | 4 +- server/startup/migrations/v061.js | 4 +- server/startup/migrations/v062.js | 4 +- server/startup/migrations/v063.js | 4 +- server/startup/migrations/v064.js | 4 +- server/startup/migrations/v065.js | 4 +- server/startup/migrations/v066.js | 4 +- server/startup/migrations/v067.js | 4 +- server/startup/migrations/v068.js | 4 +- server/startup/migrations/v069.js | 4 +- server/startup/migrations/v070.js | 4 +- server/startup/migrations/v071.js | 4 +- server/startup/migrations/v072.js | 4 +- server/startup/migrations/v073.js | 4 +- server/startup/migrations/v074.js | 4 +- server/startup/migrations/v075.js | 2 +- server/startup/migrations/v076.js | 4 +- server/startup/migrations/v077.js | 4 +- server/startup/migrations/v078.js | 4 +- server/startup/migrations/v079.js | 4 +- server/startup/migrations/v080.js | 4 +- server/startup/migrations/v081.js | 4 +- server/startup/migrations/v082.js | 4 +- server/startup/migrations/v083.js | 4 +- server/startup/migrations/v084.js | 4 +- server/startup/migrations/v085.js | 4 +- server/startup/migrations/v086.js | 2 +- server/startup/migrations/v087.js | 4 +- server/startup/migrations/v088.js | 4 +- server/startup/migrations/v089.js | 4 +- server/startup/migrations/v090.js | 4 +- server/startup/migrations/v091.js | 4 +- server/startup/migrations/v092.js | 4 +- server/startup/migrations/v093.js | 4 +- server/startup/migrations/v094.js | 4 +- server/startup/migrations/v095.js | 4 +- server/startup/migrations/v096.js | 4 +- server/startup/migrations/v097.js | 2 +- server/startup/migrations/v098.js | 4 +- server/startup/migrations/v099.js | 10 +- server/startup/migrations/v100.js | 4 +- server/startup/migrations/v101.js | 4 +- server/startup/migrations/v102.js | 4 +- server/startup/migrations/v103.js | 4 +- server/startup/migrations/v104.js | 4 +- server/startup/migrations/v105.js | 4 +- server/startup/migrations/v106.js | 4 +- server/startup/migrations/v107.js | 4 +- server/startup/migrations/v108.js | 4 +- server/startup/migrations/v109.js | 4 +- server/startup/migrations/v110.js | 4 +- server/startup/migrations/v111.js | 4 +- server/startup/migrations/v112.js | 4 +- server/startup/migrations/v113.js | 4 +- server/startup/migrations/v114.js | 4 +- server/startup/migrations/v115.js | 4 +- server/startup/migrations/v116.js | 4 +- server/startup/migrations/v117.js | 6 +- server/startup/migrations/v118.js | 4 +- server/startup/migrations/v119.js | 4 +- server/startup/migrations/v120.js | 4 +- server/startup/migrations/v121.js | 4 +- server/startup/migrations/v122.js | 4 +- server/startup/migrations/v123.js | 4 +- server/startup/migrations/v124.js | 4 +- server/startup/migrations/v125.js | 4 +- server/startup/migrations/v126.js | 4 +- server/startup/migrations/v127.js | 4 +- server/startup/migrations/v128.js | 4 +- server/startup/migrations/v129.js | 4 +- server/startup/migrations/v130.js | 4 +- server/startup/migrations/v131.js | 4 +- server/startup/migrations/v132.js | 4 +- server/startup/migrations/v133.js | 4 +- server/startup/migrations/v134.js | 4 +- server/startup/migrations/v135.js | 4 +- server/startup/migrations/v136.js | 6 +- server/startup/migrations/v137.js | 6 +- server/startup/migrations/v138.js | 4 +- server/startup/migrations/xrun.js | 2 +- server/startup/serverRunning.js | 6 +- server/stream/messages.js | 8 +- server/stream/streamBroadcast.js | 8 +- 1190 files changed, 2745 insertions(+), 2745 deletions(-) diff --git a/app/2fa/client/TOTPPassword.js b/app/2fa/client/TOTPPassword.js index 529ab6150fe..0cf6d8b9e9e 100644 --- a/app/2fa/client/TOTPPassword.js +++ b/app/2fa/client/TOTPPassword.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { modal } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { modal } from '../../ui-utils'; +import { t } from '../../utils'; import toastr from 'toastr'; function reportError(error, callback) { diff --git a/app/2fa/client/accountSecurity.js b/app/2fa/client/accountSecurity.js index 13ef90f5cd4..4e9bc5573d1 100644 --- a/app/2fa/client/accountSecurity.js +++ b/app/2fa/client/accountSecurity.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { t } from '/app/utils'; +import { modal } from '../../ui-utils'; +import { settings } from '../../settings'; +import { t } from '../../utils'; import toastr from 'toastr'; import qrcode from 'yaqrcode'; diff --git a/app/2fa/server/lib/totp.js b/app/2fa/server/lib/totp.js index 6a806be31fa..a1ad86147fe 100644 --- a/app/2fa/server/lib/totp.js +++ b/app/2fa/server/lib/totp.js @@ -1,7 +1,7 @@ import { SHA256 } from 'meteor/sha'; import { Random } from 'meteor/random'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Users } from '../../../models'; +import { settings } from '../../../settings'; import speakeasy from 'speakeasy'; export const TOTP = { diff --git a/app/2fa/server/loginHandler.js b/app/2fa/server/loginHandler.js index 4980e723a71..4067521d2c4 100644 --- a/app/2fa/server/loginHandler.js +++ b/app/2fa/server/loginHandler.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import { TOTP } from './lib/totp'; Accounts.registerLoginHandler('totp', function(options) { diff --git a/app/2fa/server/methods/disable.js b/app/2fa/server/methods/disable.js index 16ccb79e663..096db7084cf 100644 --- a/app/2fa/server/methods/disable.js +++ b/app/2fa/server/methods/disable.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { TOTP } from '../lib/totp'; Meteor.methods({ diff --git a/app/2fa/server/methods/enable.js b/app/2fa/server/methods/enable.js index d93f835b02e..35954a5b3df 100644 --- a/app/2fa/server/methods/enable.js +++ b/app/2fa/server/methods/enable.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { TOTP } from '../lib/totp'; Meteor.methods({ diff --git a/app/2fa/server/methods/regenerateCodes.js b/app/2fa/server/methods/regenerateCodes.js index cc4526d2a19..cd723e66db8 100644 --- a/app/2fa/server/methods/regenerateCodes.js +++ b/app/2fa/server/methods/regenerateCodes.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { TOTP } from '../lib/totp'; Meteor.methods({ diff --git a/app/2fa/server/methods/validateTempToken.js b/app/2fa/server/methods/validateTempToken.js index cf2ea8d22bc..39ccc904365 100644 --- a/app/2fa/server/methods/validateTempToken.js +++ b/app/2fa/server/methods/validateTempToken.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { TOTP } from '../lib/totp'; Meteor.methods({ diff --git a/app/2fa/server/startup/settings.js b/app/2fa/server/startup/settings.js index e8320018777..e83bcd8e4c9 100644 --- a/app/2fa/server/startup/settings.js +++ b/app/2fa/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('Accounts', function() { this.section('Two Factor Authentication', function() { diff --git a/app/action-links/both/lib/actionLinks.js b/app/action-links/both/lib/actionLinks.js index 9a1fa20aa58..384cc450201 100644 --- a/app/action-links/both/lib/actionLinks.js +++ b/app/action-links/both/lib/actionLinks.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Subscriptions } from '/app/models'; +import { Messages, Subscriptions } from '../../../models'; // Action Links namespace creation. export const actionLinks = { diff --git a/app/action-links/client/init.js b/app/action-links/client/init.js index 886f966fa13..5d687707a08 100644 --- a/app/action-links/client/init.js +++ b/app/action-links/client/init.js @@ -1,7 +1,7 @@ import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -import { handleError } from '/app/utils'; -import { fireGlobalEvent, Layout } from '/app/ui-utils'; +import { handleError } from '../../utils'; +import { fireGlobalEvent, Layout } from '../../ui-utils'; import { actionLinks } from '../both/lib/actionLinks'; Template.room.events({ diff --git a/app/action-links/client/lib/actionLinks.js b/app/action-links/client/lib/actionLinks.js index 887fbde5e9d..1c5b61dc4b9 100644 --- a/app/action-links/client/lib/actionLinks.js +++ b/app/action-links/client/lib/actionLinks.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { handleError } from '/app/utils'; +import { handleError } from '../../../utils'; import { actionLinks } from '../../both/lib/actionLinks'; // Action Links Handler. This method will be called off the client. diff --git a/app/analytics/client/loadScript.js b/app/analytics/client/loadScript.js index 20a28c3f8e6..a07c8cb1ac9 100644 --- a/app/analytics/client/loadScript.js +++ b/app/analytics/client/loadScript.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Template.body.onRendered(() => { Tracker.autorun((c) => { diff --git a/app/analytics/client/trackEvents.js b/app/analytics/client/trackEvents.js index 5bea1d3a784..acbbd13494f 100644 --- a/app/analytics/client/trackEvents.js +++ b/app/analytics/client/trackEvents.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { ChatRoom } from '/app/models'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { ChatRoom } from '../../models'; import { Tracker } from 'meteor/tracker'; function trackEvent(category, action, label) { diff --git a/app/analytics/server/settings.js b/app/analytics/server/settings.js index bfd83ce4ff2..932e834cdb6 100644 --- a/app/analytics/server/settings.js +++ b/app/analytics/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('Analytics', function addSettings() { this.section('Piwik', function() { diff --git a/app/api/server/api.js b/app/api/server/api.js index 43b0df84149..e87b8ded388 100644 --- a/app/api/server/api.js +++ b/app/api/server/api.js @@ -3,12 +3,12 @@ import { DDPCommon } from 'meteor/ddp-common'; import { DDP } from 'meteor/ddp'; import { Accounts } from 'meteor/accounts-base'; import { Restivus } from 'meteor/nimble:restivus'; -import { Logger } from '/app/logger'; -import { settings } from '/app/settings'; -import { metrics } from '/app/metrics'; -import { hasPermission } from '/app/authorization'; +import { Logger } from '../../logger'; +import { settings } from '../../settings'; +import { metrics } from '../../metrics'; +import { hasPermission } from '../../authorization'; import { RateLimiter } from 'meteor/rate-limit'; -import { hasAllPermission } from '/app/authorization'; +import { hasAllPermission } from '../../authorization'; import _ from 'underscore'; const logger = new Logger('API', {}); diff --git a/app/api/server/default/info.js b/app/api/server/default/info.js index 1235ed88247..7c397de09cb 100644 --- a/app/api/server/default/info.js +++ b/app/api/server/default/info.js @@ -1,5 +1,5 @@ -import { hasRole } from '/app/authorization'; -import { Info } from '/app/utils'; +import { hasRole } from '../../../authorization'; +import { Info } from '../../../utils'; import { API } from '../api'; API.default.addRoute('info', { authRequired: false }, { diff --git a/app/api/server/helpers/composeRoomWithLastMessage.js b/app/api/server/helpers/composeRoomWithLastMessage.js index 556dc13cea1..529a493d86f 100644 --- a/app/api/server/helpers/composeRoomWithLastMessage.js +++ b/app/api/server/helpers/composeRoomWithLastMessage.js @@ -1,4 +1,4 @@ -import { composeMessageObjectWithUser } from '/app/utils'; +import { composeMessageObjectWithUser } from '../../../utils'; import { API } from '../api'; API.helperMethods.set('composeRoomWithLastMessage', function _composeRoomWithLastMessage(room, userId) { diff --git a/app/api/server/helpers/getLoggedInUser.js b/app/api/server/helpers/getLoggedInUser.js index 022a93a78f5..2acd73c71e8 100644 --- a/app/api/server/helpers/getLoggedInUser.js +++ b/app/api/server/helpers/getLoggedInUser.js @@ -1,5 +1,5 @@ import { Accounts } from 'meteor/accounts-base'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { API } from '../api'; API.helperMethods.set('getLoggedInUser', function _getLoggedInUser() { diff --git a/app/api/server/helpers/getPaginationItems.js b/app/api/server/helpers/getPaginationItems.js index 30eede7de06..93a19b2cbf9 100644 --- a/app/api/server/helpers/getPaginationItems.js +++ b/app/api/server/helpers/getPaginationItems.js @@ -1,7 +1,7 @@ // If the count query param is higher than the "API_Upper_Count_Limit" setting, then we limit that // If the count query param isn't defined, then we set it to the "API_Default_Count" setting // If the count is zero, then that means unlimited and is only allowed if the setting "API_Allow_Infinite_Count" is true -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { API } from '../api'; API.helperMethods.set('getPaginationItems', function _getPaginationItems() { diff --git a/app/api/server/helpers/getUserFromParams.js b/app/api/server/helpers/getUserFromParams.js index 98656e97325..6265f074e61 100644 --- a/app/api/server/helpers/getUserFromParams.js +++ b/app/api/server/helpers/getUserFromParams.js @@ -1,6 +1,6 @@ // Convenience method, almost need to turn it into a middleware of sorts import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { API } from '../api'; API.helperMethods.set('getUserFromParams', function _getUserFromParams() { diff --git a/app/api/server/helpers/getUserInfo.js b/app/api/server/helpers/getUserInfo.js index e98aa6c7b57..379c5301d97 100644 --- a/app/api/server/helpers/getUserInfo.js +++ b/app/api/server/helpers/getUserInfo.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { getUserPreference } from '/app/utils'; +import { settings } from '../../../settings'; +import { getUserPreference } from '../../../utils'; import { API } from '../api'; const getInfoFromUserObject = (user) => { diff --git a/app/api/server/helpers/insertUserObject.js b/app/api/server/helpers/insertUserObject.js index 8eb4e1f8406..1e52665d114 100644 --- a/app/api/server/helpers/insertUserObject.js +++ b/app/api/server/helpers/insertUserObject.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { API } from '../api'; API.helperMethods.set('insertUserObject', function _addUserToObject({ object, userId }) { diff --git a/app/api/server/helpers/parseJsonQuery.js b/app/api/server/helpers/parseJsonQuery.js index d0742778d10..f752fe918d2 100644 --- a/app/api/server/helpers/parseJsonQuery.js +++ b/app/api/server/helpers/parseJsonQuery.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { EJSON } from 'meteor/ejson'; import { API } from '../api'; diff --git a/app/api/server/settings.js b/app/api/server/settings.js index 2c45d4620a3..afc90469617 100644 --- a/app/api/server/settings.js +++ b/app/api/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('General', function() { this.section('REST API', function() { diff --git a/app/api/server/v1/assets.js b/app/api/server/v1/assets.js index eeed97d6f30..a80d5044c1c 100644 --- a/app/api/server/v1/assets.js +++ b/app/api/server/v1/assets.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChatAssets } from '/app/assets'; +import { RocketChatAssets } from '../../../assets'; import Busboy from 'busboy'; import { API } from '../api'; diff --git a/app/api/server/v1/channels.js b/app/api/server/v1/channels.js index 3ce8d008d27..789d5c34389 100644 --- a/app/api/server/v1/channels.js +++ b/app/api/server/v1/channels.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { composeMessageObjectWithUser } from '../../../utils'; import { API } from '../api'; import _ from 'underscore'; diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js index da8c9cf59db..f9240ff3bcd 100644 --- a/app/api/server/v1/chat.js +++ b/app/api/server/v1/chat.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Messages } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { composeMessageObjectWithUser } from '/app/utils'; -import { processWebhookMessage } from '/app/lib'; +import { Messages } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { composeMessageObjectWithUser } from '../../../utils'; +import { processWebhookMessage } from '../../../lib'; import { API } from '../api'; API.v1.addRoute('chat.delete', { authRequired: true }, { diff --git a/app/api/server/v1/commands.js b/app/api/server/v1/commands.js index a18f24889a5..61c1be7ea67 100644 --- a/app/api/server/v1/commands.js +++ b/app/api/server/v1/commands.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { slashCommands } from '/app/utils'; -import { Rooms } from '/app/models'; +import { slashCommands } from '../../../utils'; +import { Rooms } from '../../../models'; import { API } from '../api'; API.v1.addRoute('commands.get', { authRequired: true }, { diff --git a/app/api/server/v1/emoji-custom.js b/app/api/server/v1/emoji-custom.js index b4f80f63978..f29c410a094 100644 --- a/app/api/server/v1/emoji-custom.js +++ b/app/api/server/v1/emoji-custom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { EmojiCustom } from '/app/models'; +import { EmojiCustom } from '../../../models'; import { API } from '../api'; import Busboy from 'busboy'; diff --git a/app/api/server/v1/groups.js b/app/api/server/v1/groups.js index dd7fce8ce58..5c52a8fdc8f 100644 --- a/app/api/server/v1/groups.js +++ b/app/api/server/v1/groups.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { composeMessageObjectWithUser } from '../../../utils'; import { API } from '../api'; import _ from 'underscore'; diff --git a/app/api/server/v1/im.js b/app/api/server/v1/im.js index 040bcda8fd8..20f2f4fd56d 100644 --- a/app/api/server/v1/im.js +++ b/app/api/server/v1/im.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { getRoomByNameOrIdWithOptionToJoin } from '/app/lib'; -import { Subscriptions, Uploads, Users, Messages, Rooms } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { composeMessageObjectWithUser } from '/app/utils'; -import { settings } from '/app/settings'; +import { getRoomByNameOrIdWithOptionToJoin } from '../../../lib'; +import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { composeMessageObjectWithUser } from '../../../utils'; +import { settings } from '../../../settings'; import { API } from '../api'; function findDirectMessageRoom(params, user) { diff --git a/app/api/server/v1/integrations.js b/app/api/server/v1/integrations.js index 73f0be61ca1..a7e9fff127f 100644 --- a/app/api/server/v1/integrations.js +++ b/app/api/server/v1/integrations.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { IntegrationHistory, Integrations } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { IntegrationHistory, Integrations } from '../../../models'; import { API } from '../api'; API.v1.addRoute('integrations.create', { authRequired: true }, { diff --git a/app/api/server/v1/misc.js b/app/api/server/v1/misc.js index 0068f0ac19c..19d5c4aae23 100644 --- a/app/api/server/v1/misc.js +++ b/app/api/server/v1/misc.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasRole } from '/app/authorization'; -import { Info } from '/app/utils'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { hasRole } from '../../../authorization'; +import { Info } from '../../../utils'; +import { Users } from '../../../models'; +import { settings } from '../../../settings'; import { API } from '../api'; API.v1.addRoute('info', { authRequired: false }, { diff --git a/app/api/server/v1/permissions.js b/app/api/server/v1/permissions.js index e1aa9af5e43..e8925ea900a 100644 --- a/app/api/server/v1/permissions.js +++ b/app/api/server/v1/permissions.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Permissions, Roles } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Permissions, Roles } from '../../../models'; import { API } from '../api'; /** diff --git a/app/api/server/v1/roles.js b/app/api/server/v1/roles.js index 997887ce999..78858819e5b 100644 --- a/app/api/server/v1/roles.js +++ b/app/api/server/v1/roles.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; import { API } from '../api'; API.v1.addRoute('roles.list', { authRequired: true }, { diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js index 2f8d4413b14..0e5d98f9c6c 100644 --- a/app/api/server/v1/rooms.js +++ b/app/api/server/v1/rooms.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { FileUpload } from '/app/file-upload'; -import { Rooms } from '/app/models'; +import { FileUpload } from '../../../file-upload'; +import { Rooms } from '../../../models'; import Busboy from 'busboy'; import { API } from '../api'; diff --git a/app/api/server/v1/settings.js b/app/api/server/v1/settings.js index cc023aaaaa6..284bf7558fb 100644 --- a/app/api/server/v1/settings.js +++ b/app/api/server/v1/settings.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { Settings } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Settings } from '../../../models'; +import { hasPermission } from '../../../authorization'; import { API } from '../api'; import _ from 'underscore'; diff --git a/app/api/server/v1/stats.js b/app/api/server/v1/stats.js index 71cdf987a8a..d745cda1ee4 100644 --- a/app/api/server/v1/stats.js +++ b/app/api/server/v1/stats.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Statistics } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Statistics } from '../../../models'; import { API } from '../api'; API.v1.addRoute('statistics', { authRequired: true }, { diff --git a/app/api/server/v1/subscriptions.js b/app/api/server/v1/subscriptions.js index e556ef18413..9bdfd2e6da7 100644 --- a/app/api/server/v1/subscriptions.js +++ b/app/api/server/v1/subscriptions.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; import { API } from '../api'; API.v1.addRoute('subscriptions.get', { authRequired: true }, { diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js index 8ddd109229c..dd0d0f72a3d 100644 --- a/app/api/server/v1/users.js +++ b/app/api/server/v1/users.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Users, Subscriptions } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { getURL } from '/app/utils'; +import { Users, Subscriptions } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; +import { getURL } from '../../../utils'; import { validateCustomFields, saveUser, @@ -12,7 +12,7 @@ import { checkUsernameAvailability, setUserAvatar, saveCustomFields, -} from '/app/lib'; +} from '../../../lib'; import { API } from '../api'; import _ from 'underscore'; import Busboy from 'busboy'; diff --git a/app/api/server/v1/video-conference.js b/app/api/server/v1/video-conference.js index 8968e28c980..af6d1a7813b 100644 --- a/app/api/server/v1/video-conference.js +++ b/app/api/server/v1/video-conference.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; import { API } from '../api'; API.v1.addRoute('video-conference/jitsi.update-timeout', { authRequired: true }, { diff --git a/app/apps/client/admin/appInstall.js b/app/apps/client/admin/appInstall.js index dd9c945a2bb..fe56f5d136c 100644 --- a/app/apps/client/admin/appInstall.js +++ b/app/apps/client/admin/appInstall.js @@ -10,7 +10,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { APIClient } from '/app/utils'; +import { APIClient } from '../../../utils'; Template.appInstall.helpers({ appFile() { diff --git a/app/apps/client/admin/appLogs.js b/app/apps/client/admin/appLogs.js index dbb89f3e058..be5803fc715 100644 --- a/app/apps/client/admin/appLogs.js +++ b/app/apps/client/admin/appLogs.js @@ -2,7 +2,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { APIClient } from '/app/utils'; +import { APIClient } from '../../../utils'; import moment from 'moment'; import hljs from 'highlight.js'; diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js index ef0f1d4a72c..e0493ebbb52 100644 --- a/app/apps/client/admin/appManage.js +++ b/app/apps/client/admin/appManage.js @@ -4,9 +4,9 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { TAPi18next } from 'meteor/tap:i18n'; -import { isEmail, Info, APIClient } from '/app/utils'; -import { settings } from '/app/settings'; -import { Markdown } from '/app/markdown'; +import { isEmail, Info, APIClient } from '../../../utils'; +import { settings } from '../../../settings'; +import { Markdown } from '../../../markdown'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/apps/client/admin/apps.js b/app/apps/client/admin/apps.js index 90dcc83da35..27ee486ec07 100644 --- a/app/apps/client/admin/apps.js +++ b/app/apps/client/admin/apps.js @@ -2,7 +2,7 @@ import toastr from 'toastr'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, Info, APIClient } from '/app/utils'; +import { t, Info, APIClient } from '../../../utils'; import { AppEvents } from '../communication'; import { Apps } from '../orchestrator'; diff --git a/app/apps/client/communication/websockets.js b/app/apps/client/communication/websockets.js index 70239b359a6..905c369650c 100644 --- a/app/apps/client/communication/websockets.js +++ b/app/apps/client/communication/websockets.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands, APIClient } from '/app/utils'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { slashCommands, APIClient } from '../../../utils'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; export const AppEvents = Object.freeze({ APP_ADDED: 'app/added', diff --git a/app/apps/client/orchestrator.js b/app/apps/client/orchestrator.js index 9596aab1221..4175fe0731b 100644 --- a/app/apps/client/orchestrator.js +++ b/app/apps/client/orchestrator.js @@ -4,10 +4,10 @@ import { Utilities } from '../lib/misc/Utilities'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { TAPi18next } from 'meteor/tap:i18n'; -import { APIClient } from '/app/utils'; -import { AdminBox } from '/app/ui-utils'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { APIClient } from '../../utils'; +import { AdminBox } from '../../ui-utils'; +import { CachedCollectionManager } from '../../ui-cached-collection'; +import { hasAtLeastOnePermission } from '../../authorization'; export let Apps; diff --git a/app/apps/server/bridges/commands.js b/app/apps/server/bridges/commands.js index 8f7b9d73f21..81254753ea8 100644 --- a/app/apps/server/bridges/commands.js +++ b/app/apps/server/bridges/commands.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../../utils'; import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands'; import { Utilities } from '../../lib/misc/Utilities'; diff --git a/app/apps/server/bridges/internal.js b/app/apps/server/bridges/internal.js index 37d57525667..2a41c582989 100644 --- a/app/apps/server/bridges/internal.js +++ b/app/apps/server/bridges/internal.js @@ -1,4 +1,4 @@ -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; export class AppInternalBridge { constructor(orch) { diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js index 32eba76e823..7ddf3b422af 100644 --- a/app/apps/server/bridges/messages.js +++ b/app/apps/server/bridges/messages.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { Messages, Users, Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { Messages, Users, Subscriptions } from '../../../models'; +import { Notifications } from '../../../notifications'; export class AppMessageBridge { constructor(orch) { @@ -29,7 +29,7 @@ export class AppMessageBridge { async update(message, appId) { console.log(`The App ${ appId } is updating a message.`); if (!this.updateMessage) { - const { updateMessage } = await import('/app/lib'); + const { updateMessage } = await import('../../../lib'); this.updateMessage = updateMessage; } diff --git a/app/apps/server/bridges/rooms.js b/app/apps/server/bridges/rooms.js index 1baf1c4195b..db2036d9fe9 100644 --- a/app/apps/server/bridges/rooms.js +++ b/app/apps/server/bridges/rooms.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions, Users } from '/app/models'; +import { Rooms, Subscriptions, Users } from '../../../models'; import { RoomType } from '@rocket.chat/apps-engine/definition/rooms'; export class AppRoomBridge { @@ -102,7 +102,7 @@ export class AppRoomBridge { console.log(`The App ${ appId } is updating a room.`); if (!this.addUserToRoom) { - const { addUserToRoom } = await import('/app/lib'); + const { addUserToRoom } = await import('../../../lib'); this.addUserToRoom = addUserToRoom; } diff --git a/app/apps/server/bridges/settings.js b/app/apps/server/bridges/settings.js index ce9fdef933b..6e0f2fcc583 100644 --- a/app/apps/server/bridges/settings.js +++ b/app/apps/server/bridges/settings.js @@ -1,4 +1,4 @@ -import { Settings } from '/app/models'; +import { Settings } from '../../../models'; export class AppSettingBridge { constructor(orch) { diff --git a/app/apps/server/communication/methods.js b/app/apps/server/communication/methods.js index 22ef00e50f9..986f13717fc 100644 --- a/app/apps/server/communication/methods.js +++ b/app/apps/server/communication/methods.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; +import { settings } from '../../../settings'; +import { hasPermission } from '../../../authorization'; const waitToLoad = function(orch) { return new Promise((resolve) => { diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js index 5f5b5852531..5606bcb6b85 100644 --- a/app/apps/server/communication/rest.js +++ b/app/apps/server/communication/rest.js @@ -33,7 +33,7 @@ export class AppsRestApi { } async loadAPI() { - const { API } = await import('/app/api'); + const { API } = await import('../../../api'); _API = API; this.api = new API.ApiClass({ version: 'apps', diff --git a/app/apps/server/converters/messages.js b/app/apps/server/converters/messages.js index bd14bb0a194..ef93fc37fa1 100644 --- a/app/apps/server/converters/messages.js +++ b/app/apps/server/converters/messages.js @@ -1,5 +1,5 @@ import { Random } from 'meteor/random'; -import { Messages, Rooms, Users } from '/app/models'; +import { Messages, Rooms, Users } from '../../../models'; export class AppMessagesConverter { constructor(orch) { diff --git a/app/apps/server/converters/rooms.js b/app/apps/server/converters/rooms.js index f1f2b644f1a..979558c33f2 100644 --- a/app/apps/server/converters/rooms.js +++ b/app/apps/server/converters/rooms.js @@ -1,4 +1,4 @@ -import { Rooms, Users } from '/app/models'; +import { Rooms, Users } from '../../../models'; import { RoomType } from '@rocket.chat/apps-engine/definition/rooms'; export class AppRoomsConverter { diff --git a/app/apps/server/converters/settings.js b/app/apps/server/converters/settings.js index 2d75ae3b658..f8c77203ff8 100644 --- a/app/apps/server/converters/settings.js +++ b/app/apps/server/converters/settings.js @@ -1,4 +1,4 @@ -import { Settings } from '/app/models'; +import { Settings } from '../../../models'; import { SettingType } from '@rocket.chat/apps-engine/definition/settings'; export class AppSettingsConverter { diff --git a/app/apps/server/converters/users.js b/app/apps/server/converters/users.js index 4c802924f5a..803d40f9973 100644 --- a/app/apps/server/converters/users.js +++ b/app/apps/server/converters/users.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { UserStatusConnection, UserType } from '@rocket.chat/apps-engine/definition/users'; export class AppUsersConverter { diff --git a/app/apps/server/orchestrator.js b/app/apps/server/orchestrator.js index 721ff0a9430..2bc117891c2 100644 --- a/app/apps/server/orchestrator.js +++ b/app/apps/server/orchestrator.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions, AppsLogsModel, AppsModel, AppsPersistenceModel } from '/app/models'; -import { settings } from '/app/settings'; +import { Permissions, AppsLogsModel, AppsModel, AppsPersistenceModel } from '../../models'; +import { settings } from '../../settings'; import { RealAppBridges } from './bridges'; import { AppMethods, AppsRestApi, AppServerNotifier } from './communication'; import { AppMessagesConverter, AppRoomsConverter, AppSettingsConverter, AppUsersConverter } from './converters'; diff --git a/app/assets/server/assets.js b/app/assets/server/assets.js index 4c19a89e2ae..a11bef444f6 100644 --- a/app/assets/server/assets.js +++ b/app/assets/server/assets.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; -import { getURL } from '/app/utils'; -import { hasPermission } from '/app/authorization'; -import { RocketChatFile } from '/app/file'; +import { settings } from '../../settings'; +import { Settings } from '../../models'; +import { getURL } from '../../utils'; +import { hasPermission } from '../../authorization'; +import { RocketChatFile } from '../../file'; import { WebAppHashing } from 'meteor/webapp-hashing'; import { WebAppInternals } from 'meteor/webapp'; import _ from 'underscore'; diff --git a/app/authorization/client/hasPermission.js b/app/authorization/client/hasPermission.js index 524eee1decd..8b7fda69bca 100644 --- a/app/authorization/client/hasPermission.js +++ b/app/authorization/client/hasPermission.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import * as Models from '/app/models'; +import * as Models from '../../models'; import { ChatPermissions } from './lib/ChatPermissions'; function atLeastOne(permissions = [], scope) { diff --git a/app/authorization/client/hasRole.js b/app/authorization/client/hasRole.js index a971c7f8f90..710ae1803ca 100644 --- a/app/authorization/client/hasRole.js +++ b/app/authorization/client/hasRole.js @@ -1,4 +1,4 @@ -import { Roles } from '/app/models'; +import { Roles } from '../../models'; export const hasRole = (userId, roleNames, scope) => { roleNames = [].concat(roleNames); diff --git a/app/authorization/client/lib/ChatPermissions.js b/app/authorization/client/lib/ChatPermissions.js index 08067918250..faafd72fa5e 100644 --- a/app/authorization/client/lib/ChatPermissions.js +++ b/app/authorization/client/lib/ChatPermissions.js @@ -1,3 +1,3 @@ -import { AuthzCachedCollection } from '/app/models'; +import { AuthzCachedCollection } from '../../../models'; export const ChatPermissions = AuthzCachedCollection.collection; diff --git a/app/authorization/client/route.js b/app/authorization/client/route.js index 7bc0365eaea..2f674488ac5 100644 --- a/app/authorization/client/route.js +++ b/app/authorization/client/route.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { t } from '/app/utils'; +import { t } from '../../utils'; FlowRouter.route('/admin/permissions', { name: 'admin-permissions', diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js index 5bd4ab4f8f0..6b2e1dc398e 100644 --- a/app/authorization/client/startup.js +++ b/app/authorization/client/startup.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { CachedCollectionManager } from '../../ui-cached-collection'; import { hasAllPermission } from './hasPermission'; Meteor.startup(async() => { - const { AdminBox } = await import('/app/ui-utils'); + const { AdminBox } = await import('../../ui-utils'); CachedCollectionManager.onLogin(() => Meteor.subscribe('roles')); diff --git a/app/authorization/client/usersNameChanged.js b/app/authorization/client/usersNameChanged.js index 6dfe491cf1b..2409ab5ccc3 100644 --- a/app/authorization/client/usersNameChanged.js +++ b/app/authorization/client/usersNameChanged.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Notifications } from '/app/notifications'; -import { RoomRoles } from '/app/models'; +import { Notifications } from '../../notifications'; +import { RoomRoles } from '../../models'; Meteor.startup(function() { Notifications.onLogged('Users:NameChanged', function({ _id, name }) { diff --git a/app/authorization/client/views/permissions.js b/app/authorization/client/views/permissions.js index bd23a3f6bda..8119d08381d 100644 --- a/app/authorization/client/views/permissions.js +++ b/app/authorization/client/views/permissions.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; import { ChatPermissions } from '../lib/ChatPermissions'; import { hasAllPermission } from '../hasPermission'; diff --git a/app/authorization/client/views/permissionsRole.js b/app/authorization/client/views/permissionsRole.js index 5cd30c3d43a..fb84f2f66e9 100644 --- a/app/authorization/client/views/permissionsRole.js +++ b/app/authorization/client/views/permissionsRole.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; -import { Roles } from '/app/models'; +import { t, handleError } from '../../../utils'; +import { Roles } from '../../../models'; import { hasAllPermission } from '../hasPermission'; import toastr from 'toastr'; @@ -114,7 +114,7 @@ Template.permissionsRole.helpers({ Template.permissionsRole.events({ async 'click .remove-user'(e, instance) { if (!_modal) { - const { modal } = await import('/app/ui-utils'); + const { modal } = await import('../../../ui-utils'); _modal = modal; } e.preventDefault(); diff --git a/app/authorization/server/functions/addUserRoles.js b/app/authorization/server/functions/addUserRoles.js index 54efa65da47..49962c40632 100644 --- a/app/authorization/server/functions/addUserRoles.js +++ b/app/authorization/server/functions/addUserRoles.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Roles } from '/app/models'; +import { Users, Roles } from '../../../models'; import { getRoles } from './getRoles'; import _ from 'underscore'; diff --git a/app/authorization/server/functions/canAccessRoom.js b/app/authorization/server/functions/canAccessRoom.js index 1dc69a67ab3..af2035593a5 100644 --- a/app/authorization/server/functions/canAccessRoom.js +++ b/app/authorization/server/functions/canAccessRoom.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { Subscriptions } from '/app/models'; +import { settings } from '../../../settings'; +import { Subscriptions } from '../../../models'; import { hasPermission } from './hasPermission'; export const roomAccessValidators = [ diff --git a/app/authorization/server/functions/getRoles.js b/app/authorization/server/functions/getRoles.js index 79b2713c099..9d20c72d29a 100644 --- a/app/authorization/server/functions/getRoles.js +++ b/app/authorization/server/functions/getRoles.js @@ -1,3 +1,3 @@ -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; export const getRoles = () => Roles.find().fetch(); diff --git a/app/authorization/server/functions/getUsersInRole.js b/app/authorization/server/functions/getUsersInRole.js index 687eeabb0ea..255a1948597 100644 --- a/app/authorization/server/functions/getUsersInRole.js +++ b/app/authorization/server/functions/getUsersInRole.js @@ -1,4 +1,4 @@ -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; export const getUsersInRole = (roleName, scope, options) => Roles.findUsersInRole(roleName, scope, options); diff --git a/app/authorization/server/functions/hasPermission.js b/app/authorization/server/functions/hasPermission.js index bb7cfa44f67..27da342c3a5 100644 --- a/app/authorization/server/functions/hasPermission.js +++ b/app/authorization/server/functions/hasPermission.js @@ -1,4 +1,4 @@ -import { Roles, Permissions } from '/app/models'; +import { Roles, Permissions } from '../../../models'; function atLeastOne(userId, permissions = [], scope) { return permissions.some((permissionId) => { diff --git a/app/authorization/server/functions/hasRole.js b/app/authorization/server/functions/hasRole.js index a971c7f8f90..879aeaa0124 100644 --- a/app/authorization/server/functions/hasRole.js +++ b/app/authorization/server/functions/hasRole.js @@ -1,4 +1,4 @@ -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; export const hasRole = (userId, roleNames, scope) => { roleNames = [].concat(roleNames); diff --git a/app/authorization/server/functions/removeUserFromRoles.js b/app/authorization/server/functions/removeUserFromRoles.js index 302bf0d1aa5..8f2b207e6d1 100644 --- a/app/authorization/server/functions/removeUserFromRoles.js +++ b/app/authorization/server/functions/removeUserFromRoles.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Roles } from '/app/models'; +import { Users, Roles } from '../../../models'; import { getRoles } from './getRoles'; import _ from 'underscore'; diff --git a/app/authorization/server/methods/addPermissionToRole.js b/app/authorization/server/methods/addPermissionToRole.js index a653879eca3..7ec25d35d68 100644 --- a/app/authorization/server/methods/addPermissionToRole.js +++ b/app/authorization/server/methods/addPermissionToRole.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../../models'; import { hasPermission } from '../functions/hasPermission'; Meteor.methods({ diff --git a/app/authorization/server/methods/addUserToRole.js b/app/authorization/server/methods/addUserToRole.js index cd1549f98ba..e1cba8a9839 100644 --- a/app/authorization/server/methods/addUserToRole.js +++ b/app/authorization/server/methods/addUserToRole.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Roles } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { Users, Roles } from '../../../models'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; import { hasPermission } from '../functions/hasPermission'; import _ from 'underscore'; diff --git a/app/authorization/server/methods/deleteRole.js b/app/authorization/server/methods/deleteRole.js index 3204f4939fc..aa34b9b76f1 100644 --- a/app/authorization/server/methods/deleteRole.js +++ b/app/authorization/server/methods/deleteRole.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import * as Models from '/app/models'; +import * as Models from '../../../models'; import { hasPermission } from '../functions/hasPermission'; Meteor.methods({ diff --git a/app/authorization/server/methods/removeRoleFromPermission.js b/app/authorization/server/methods/removeRoleFromPermission.js index a9aa8eaa8af..0f83861be2a 100644 --- a/app/authorization/server/methods/removeRoleFromPermission.js +++ b/app/authorization/server/methods/removeRoleFromPermission.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../../models'; import { hasPermission } from '../functions/hasPermission'; Meteor.methods({ diff --git a/app/authorization/server/methods/removeUserFromRole.js b/app/authorization/server/methods/removeUserFromRole.js index d366d832843..241f97ff935 100644 --- a/app/authorization/server/methods/removeUserFromRole.js +++ b/app/authorization/server/methods/removeUserFromRole.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Roles } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { Roles } from '../../../models'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; import { hasPermission } from '../functions/hasPermission'; import _ from 'underscore'; diff --git a/app/authorization/server/methods/saveRole.js b/app/authorization/server/methods/saveRole.js index 45e6bc36c4d..4d7271932a3 100644 --- a/app/authorization/server/methods/saveRole.js +++ b/app/authorization/server/methods/saveRole.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Roles } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { Roles } from '../../../models'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; import { hasPermission } from '../functions/hasPermission'; Meteor.methods({ diff --git a/app/authorization/server/publications/permissions.js b/app/authorization/server/publications/permissions.js index 9298e21db46..2e8a6df20fe 100644 --- a/app/authorization/server/publications/permissions.js +++ b/app/authorization/server/publications/permissions.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { Permissions } from '../../../models'; +import { Notifications } from '../../../notifications'; Meteor.methods({ 'permissions/get'(updatedAt) { diff --git a/app/authorization/server/publications/roles.js b/app/authorization/server/publications/roles.js index d4c54ae959f..868174a7c11 100644 --- a/app/authorization/server/publications/roles.js +++ b/app/authorization/server/publications/roles.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Roles } from '/app/models'; +import { Roles } from '../../../models'; Meteor.publish('roles', function() { if (!this.userId) { diff --git a/app/authorization/server/startup.js b/app/authorization/server/startup.js index fc17a6f2a78..d79acd6d870 100644 --- a/app/authorization/server/startup.js +++ b/app/authorization/server/startup.js @@ -1,6 +1,6 @@ /* eslint no-multi-spaces: 0 */ import { Meteor } from 'meteor/meteor'; -import { Roles, Permissions } from '/app/models'; +import { Roles, Permissions } from '../../models'; Meteor.startup(function() { // Note: diff --git a/app/autolinker/client/client.js b/app/autolinker/client/client.js index a5250cfd051..2b6d46cc58c 100644 --- a/app/autolinker/client/client.js +++ b/app/autolinker/client/client.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import s from 'underscore.string'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import Autolinker from 'autolinker'; const createAutolinker = () => { diff --git a/app/autolinker/server/settings.js b/app/autolinker/server/settings.js index c055eaa72f3..d8b3a32eae2 100644 --- a/app/autolinker/server/settings.js +++ b/app/autolinker/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { const enableQuery = { diff --git a/app/autotranslate/client/lib/actionButton.js b/app/autotranslate/client/lib/actionButton.js index de5a91c59f0..8bc7f46cc8f 100644 --- a/app/autotranslate/client/lib/actionButton.js +++ b/app/autotranslate/client/lib/actionButton.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { MessageAction } from '/app/ui-utils'; -import { Messages } from '/app/models'; +import { settings } from '../../../settings'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { MessageAction } from '../../../ui-utils'; +import { Messages } from '../../../models'; import { AutoTranslate } from './autotranslate'; Meteor.startup(function() { diff --git a/app/autotranslate/client/lib/autotranslate.js b/app/autotranslate/client/lib/autotranslate.js index df6ad4ad3c5..7ce10296636 100644 --- a/app/autotranslate/client/lib/autotranslate.js +++ b/app/autotranslate/client/lib/autotranslate.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { Subscriptions, Messages } from '/app/models'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { Subscriptions, Messages } from '../../../models'; +import { callbacks } from '../../../callbacks'; +import { settings } from '../../../settings'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; import _ from 'underscore'; import mem from 'mem'; diff --git a/app/autotranslate/client/lib/tabBar.js b/app/autotranslate/client/lib/tabBar.js index 9719b89cca9..b73ad117206 100644 --- a/app/autotranslate/client/lib/tabBar.js +++ b/app/autotranslate/client/lib/tabBar.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { TabBar } from '/app/ui-utils'; +import { settings } from '../../../settings'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { TabBar } from '../../../ui-utils'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/app/autotranslate/client/views/autoTranslateFlexTab.js b/app/autotranslate/client/views/autoTranslateFlexTab.js index 4dcce2df89a..6f2e0f787ef 100644 --- a/app/autotranslate/client/views/autoTranslateFlexTab.js +++ b/app/autotranslate/client/views/autoTranslateFlexTab.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Template } from 'meteor/templating'; -import { ChatSubscription, Subscriptions, Messages } from '/app/models'; -import { t, handleError } from '/app/utils'; +import { ChatSubscription, Subscriptions, Messages } from '../../../models'; +import { t, handleError } from '../../../utils'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/autotranslate/server/autotranslate.js b/app/autotranslate/server/autotranslate.js index fa4dd731989..546e70e2f74 100644 --- a/app/autotranslate/server/autotranslate.js +++ b/app/autotranslate/server/autotranslate.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Subscriptions, Messages } from '/app/models'; -import { Markdown } from '/app/markdown'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { Subscriptions, Messages } from '../../models'; +import { Markdown } from '../../markdown'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/autotranslate/server/methods/getSupportedLanguages.js b/app/autotranslate/server/methods/getSupportedLanguages.js index 43227d78bb7..a5314246498 100644 --- a/app/autotranslate/server/methods/getSupportedLanguages.js +++ b/app/autotranslate/server/methods/getSupportedLanguages.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import AutoTranslate from '../autotranslate'; Meteor.methods({ diff --git a/app/autotranslate/server/methods/saveSettings.js b/app/autotranslate/server/methods/saveSettings.js index c536bb29759..16544597def 100644 --- a/app/autotranslate/server/methods/saveSettings.js +++ b/app/autotranslate/server/methods/saveSettings.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Subscriptions } from '../../../models'; Meteor.methods({ 'autoTranslate.saveSettings'(rid, field, value, options) { diff --git a/app/autotranslate/server/methods/translateMessage.js b/app/autotranslate/server/methods/translateMessage.js index 7dafb2a9e26..c57abe6d631 100644 --- a/app/autotranslate/server/methods/translateMessage.js +++ b/app/autotranslate/server/methods/translateMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; import AutoTranslate from '../autotranslate'; Meteor.methods({ diff --git a/app/autotranslate/server/permissions.js b/app/autotranslate/server/permissions.js index 76ea2612b2f..aadd3fbb44a 100644 --- a/app/autotranslate/server/permissions.js +++ b/app/autotranslate/server/permissions.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../models'; Meteor.startup(() => { if (Permissions) { diff --git a/app/autotranslate/server/settings.js b/app/autotranslate/server/settings.js index 296e59ab15d..1045144ccef 100644 --- a/app/autotranslate/server/settings.js +++ b/app/autotranslate/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.add('AutoTranslate_Enabled', false, { type: 'boolean', group: 'Message', section: 'AutoTranslate', public: true }); diff --git a/app/blockstack/server/logger.js b/app/blockstack/server/logger.js index 9d8c696052d..e88f4df9bf1 100644 --- a/app/blockstack/server/logger.js +++ b/app/blockstack/server/logger.js @@ -1,3 +1,3 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; export const logger = new Logger('Blockstack'); diff --git a/app/blockstack/server/loginHandler.js b/app/blockstack/server/loginHandler.js index b6f3e6bf0ad..83b5a71a60a 100644 --- a/app/blockstack/server/loginHandler.js +++ b/app/blockstack/server/loginHandler.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { setUserAvatar } from '/app/lib'; +import { settings } from '../../settings'; +import { Users } from '../../models'; +import { setUserAvatar } from '../../lib'; import { updateOrCreateUser } from './userHandler'; import { handleAccessToken } from './tokenHandler'; import { logger } from './logger'; diff --git a/app/blockstack/server/routes.js b/app/blockstack/server/routes.js index afead6b846e..1f19ecb8c69 100644 --- a/app/blockstack/server/routes.js +++ b/app/blockstack/server/routes.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; -import { RocketChatAssets } from '/app/assets'; +import { settings } from '../../settings'; +import { RocketChatAssets } from '../../assets'; WebApp.connectHandlers.use('/_blockstack/manifest', Meteor.bindEnvironment(function(req, res) { const name = settings.get('Site_Name'); diff --git a/app/blockstack/server/settings.js b/app/blockstack/server/settings.js index 0584f59674b..be4f0095aaf 100644 --- a/app/blockstack/server/settings.js +++ b/app/blockstack/server/settings.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { ServiceConfiguration } from 'meteor/service-configuration'; import { logger } from './logger'; diff --git a/app/blockstack/server/userHandler.js b/app/blockstack/server/userHandler.js index 92da2306398..4b3bdd28c58 100644 --- a/app/blockstack/server/userHandler.js +++ b/app/blockstack/server/userHandler.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { generateUsernameSuggestion } from '/app/lib'; +import { generateUsernameSuggestion } from '../../lib'; import { logger } from './logger'; // Updates or creates a user after we authenticate with Blockstack diff --git a/app/bot-helpers/server/index.js b/app/bot-helpers/server/index.js index 8dcc5d6af17..ec853a1d35b 100644 --- a/app/bot-helpers/server/index.js +++ b/app/bot-helpers/server/index.js @@ -1,8 +1,8 @@ import './settings'; import { Meteor } from 'meteor/meteor'; -import { Users, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; +import { Users, Rooms } from '../../models'; +import { settings } from '../../settings'; +import { hasRole } from '../../authorization'; import _ from 'underscore'; /** diff --git a/app/bot-helpers/server/settings.js b/app/bot-helpers/server/settings.js index e176ab3b169..fc5206c17d0 100644 --- a/app/bot-helpers/server/settings.js +++ b/app/bot-helpers/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('Bots', function() { diff --git a/app/cas/client/cas_client.js b/app/cas/client/cas_client.js index da08334ba46..2f451f1929c 100644 --- a/app/cas/client/cas_client.js +++ b/app/cas/client/cas_client.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { Random } from 'meteor/random'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; const openCenteredPopup = function(url, width, height) { diff --git a/app/cas/server/cas_rocketchat.js b/app/cas/server/cas_rocketchat.js index 6432a0e397e..d90c1639ca3 100644 --- a/app/cas/server/cas_rocketchat.js +++ b/app/cas/server/cas_rocketchat.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Logger } from '/app/logger'; -import { settings } from '/app/settings'; +import { Logger } from '../../logger'; +import { settings } from '../../settings'; import { ServiceConfiguration } from 'meteor/service-configuration'; export const logger = new Logger('CAS', {}); diff --git a/app/cas/server/cas_server.js b/app/cas/server/cas_server.js index 06fc6a2c780..c3d60a2a5af 100644 --- a/app/cas/server/cas_server.js +++ b/app/cas/server/cas_server.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { Random } from 'meteor/random'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { RoutePolicy } from 'meteor/routepolicy'; -import { Rooms, Subscriptions, CredentialTokens } from '/app/models'; -import { _setRealName } from '/app/lib'; +import { Rooms, Subscriptions, CredentialTokens } from '../../models'; +import { _setRealName } from '../../lib'; import { logger } from './cas_rocketchat'; import _ from 'underscore'; import fiber from 'fibers'; diff --git a/app/channel-settings-mail-messages/client/lib/startup.js b/app/channel-settings-mail-messages/client/lib/startup.js index a59a306c3b1..0ed7a682f79 100644 --- a/app/channel-settings-mail-messages/client/lib/startup.js +++ b/app/channel-settings-mail-messages/client/lib/startup.js @@ -1,7 +1,7 @@ // import resetSelection from '../resetSelection'; import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { TabBar } from '../../../ui-utils'; +import { hasAllPermission } from '../../../authorization'; Meteor.startup(() => { TabBar.addButton({ diff --git a/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js index 52dacc2e9b6..2d0424b3327 100644 --- a/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js +++ b/app/channel-settings-mail-messages/client/views/mailMessagesInstructions.js @@ -4,9 +4,9 @@ import { Blaze } from 'meteor/blaze'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; -import { ChatRoom } from '/app/models'; -import { t, isEmail, handleError, roomTypes } from '/app/utils'; -import { settings } from '/app/settings'; +import { ChatRoom } from '../../../models'; +import { t, isEmail, handleError, roomTypes } from '../../../utils'; +import { settings } from '../../../settings'; import { Deps } from 'meteor/deps'; import toastr from 'toastr'; import resetSelection from '../resetSelection'; diff --git a/app/channel-settings-mail-messages/server/lib/startup.js b/app/channel-settings-mail-messages/server/lib/startup.js index b1ca4b378a3..c96f5ac6e6c 100644 --- a/app/channel-settings-mail-messages/server/lib/startup.js +++ b/app/channel-settings-mail-messages/server/lib/startup.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../../models'; Meteor.startup(function() { const permission = { diff --git a/app/channel-settings-mail-messages/server/methods/mailMessages.js b/app/channel-settings-mail-messages/server/methods/mailMessages.js index 96609757371..d5a832730a1 100644 --- a/app/channel-settings-mail-messages/server/methods/mailMessages.js +++ b/app/channel-settings-mail-messages/server/methods/mailMessages.js @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Message } from '/app/ui-utils'; +import { hasPermission } from '../../../authorization'; +import { Users, Messages } from '../../../models'; +import { settings } from '../../../settings'; +import { Message } from '../../../ui-utils'; import _ from 'underscore'; import moment from 'moment'; -import * as Mailer from '/app/mailer'; +import * as Mailer from '../../../mailer'; Meteor.methods({ 'mailMessages'(data) { diff --git a/app/channel-settings/client/startup/messageTypes.js b/app/channel-settings/client/startup/messageTypes.js index 0b1a5e860cb..c0128c87ef3 100644 --- a/app/channel-settings/client/startup/messageTypes.js +++ b/app/channel-settings/client/startup/messageTypes.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { MessageTypes } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { MessageTypes } from '../../../ui-utils'; +import { t } from '../../../utils'; import s from 'underscore.string'; Meteor.startup(function() { diff --git a/app/channel-settings/client/startup/tabBar.js b/app/channel-settings/client/startup/tabBar.js index 347d23d6077..89e032c8a65 100644 --- a/app/channel-settings/client/startup/tabBar.js +++ b/app/channel-settings/client/startup/tabBar.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../../ui-utils'; Meteor.startup(() => { TabBar.addButton({ diff --git a/app/channel-settings/client/startup/trackSettingsChange.js b/app/channel-settings/client/startup/trackSettingsChange.js index c91554e56b5..3b4c423725a 100644 --- a/app/channel-settings/client/startup/trackSettingsChange.js +++ b/app/channel-settings/client/startup/trackSettingsChange.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -import { callbacks } from '/app/callbacks'; -import { RoomManager } from '/app/ui-utils'; -import { roomTypes } from '/app/utils'; -import { ChatRoom, ChatSubscription } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { RoomManager } from '../../../ui-utils'; +import { roomTypes } from '../../../utils'; +import { ChatRoom, ChatSubscription } from '../../../models'; Meteor.startup(function() { const roomSettingsChangedCallback = (msg) => { diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js index 997f390ee7c..454c15eadb7 100644 --- a/app/channel-settings/client/views/channelSettings.js +++ b/app/channel-settings/client/views/channelSettings.js @@ -5,12 +5,12 @@ import { TAPi18n } from 'meteor/tap:i18n'; import toastr from 'toastr'; import moment from 'moment'; import s from 'underscore.string'; -import { modal, popover, call, erase, hide, leave } from '/app/ui-utils'; -import { ChatRoom } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { hasPermission, hasAllPermission, hasRole, hasAtLeastOnePermission } from '/app/authorization'; -import { t, roomTypes, RoomSettingsEnum } from '/app/utils'; +import { modal, popover, call, erase, hide, leave } from '../../../ui-utils'; +import { ChatRoom } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { hasPermission, hasAllPermission, hasRole, hasAtLeastOnePermission } from '../../../authorization'; +import { t, roomTypes, RoomSettingsEnum } from '../../../utils'; import { ChannelSettings } from '../lib/ChannelSettings'; const common = { diff --git a/app/channel-settings/server/functions/saveReactWhenReadOnly.js b/app/channel-settings/server/functions/saveReactWhenReadOnly.js index dee780d7795..c50d4c3aadb 100644 --- a/app/channel-settings/server/functions/saveReactWhenReadOnly.js +++ b/app/channel-settings/server/functions/saveReactWhenReadOnly.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; export const saveReactWhenReadOnly = function(rid, allowReact) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomAnnouncement.js b/app/channel-settings/server/functions/saveRoomAnnouncement.js index 39925a36d3e..4c31a9b11d8 100644 --- a/app/channel-settings/server/functions/saveRoomAnnouncement.js +++ b/app/channel-settings/server/functions/saveRoomAnnouncement.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms, Messages } from '/app/models'; +import { Rooms, Messages } from '../../../models'; export const saveRoomAnnouncement = function(rid, roomAnnouncement, user, sendMessage = true) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomCustomFields.js b/app/channel-settings/server/functions/saveRoomCustomFields.js index 5eca7e4fd2e..da8fea1b187 100644 --- a/app/channel-settings/server/functions/saveRoomCustomFields.js +++ b/app/channel-settings/server/functions/saveRoomCustomFields.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms, Subscriptions } from '/app/models'; +import { Rooms, Subscriptions } from '../../../models'; export const saveRoomCustomFields = function(rid, roomCustomFields) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomDescription.js b/app/channel-settings/server/functions/saveRoomDescription.js index 896ec0f731b..72a7a310b5c 100644 --- a/app/channel-settings/server/functions/saveRoomDescription.js +++ b/app/channel-settings/server/functions/saveRoomDescription.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms, Messages } from '/app/models'; +import { Rooms, Messages } from '../../../models'; export const saveRoomDescription = function(rid, roomDescription, user) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomName.js b/app/channel-settings/server/functions/saveRoomName.js index 96a89a6e215..e10c75674f2 100644 --- a/app/channel-settings/server/functions/saveRoomName.js +++ b/app/channel-settings/server/functions/saveRoomName.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Messages, Subscriptions, Integrations } from '/app/models'; -import { roomTypes, getValidRoomName } from '/app/utils'; +import { Rooms, Messages, Subscriptions, Integrations } from '../../../models'; +import { roomTypes, getValidRoomName } from '../../../utils'; export const saveRoomName = function(rid, displayName, user, sendMessage = true) { const room = Rooms.findOneById(rid); diff --git a/app/channel-settings/server/functions/saveRoomReadOnly.js b/app/channel-settings/server/functions/saveRoomReadOnly.js index c11b6ce5349..b5d88c96c8b 100644 --- a/app/channel-settings/server/functions/saveRoomReadOnly.js +++ b/app/channel-settings/server/functions/saveRoomReadOnly.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Rooms } from '../../../models'; +import { hasPermission } from '../../../authorization'; export const saveRoomReadOnly = function(rid, readOnly) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomSystemMessages.js b/app/channel-settings/server/functions/saveRoomSystemMessages.js index c798974bf0d..7fb229e0d12 100644 --- a/app/channel-settings/server/functions/saveRoomSystemMessages.js +++ b/app/channel-settings/server/functions/saveRoomSystemMessages.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; export const saveRoomSystemMessages = function(rid, systemMessages) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomTokens.js b/app/channel-settings/server/functions/saveRoomTokens.js index ba8432e51b7..ad68265b9cf 100644 --- a/app/channel-settings/server/functions/saveRoomTokens.js +++ b/app/channel-settings/server/functions/saveRoomTokens.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; export const saveRoomTokenpass = function(rid, tokenpass) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomTopic.js b/app/channel-settings/server/functions/saveRoomTopic.js index b710dec08cb..a12bbef2c15 100644 --- a/app/channel-settings/server/functions/saveRoomTopic.js +++ b/app/channel-settings/server/functions/saveRoomTopic.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms, Messages } from '/app/models'; +import { Rooms, Messages } from '../../../models'; export const saveRoomTopic = function(rid, roomTopic, user, sendMessage = true) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveRoomType.js b/app/channel-settings/server/functions/saveRoomType.js index 5e9adcf8c47..e848be23b80 100644 --- a/app/channel-settings/server/functions/saveRoomType.js +++ b/app/channel-settings/server/functions/saveRoomType.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; +import { Rooms, Subscriptions, Messages } from '../../../models'; +import { settings } from '../../../settings'; export const saveRoomType = function(rid, roomType, user, sendMessage = true) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/functions/saveStreamingOptions.js b/app/channel-settings/server/functions/saveStreamingOptions.js index 338657ec693..5b5490314de 100644 --- a/app/channel-settings/server/functions/saveStreamingOptions.js +++ b/app/channel-settings/server/functions/saveStreamingOptions.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; export const saveStreamingOptions = function(rid, options) { if (!Match.test(rid, String)) { diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js index b6d82a3044a..ee21ae0523c 100644 --- a/app/channel-settings/server/methods/saveRoomSettings.js +++ b/app/channel-settings/server/methods/saveRoomSettings.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; +import { callbacks } from '../../../callbacks'; import { saveRoomName } from '../functions/saveRoomName'; import { saveRoomTopic } from '../functions/saveRoomTopic'; diff --git a/app/channel-settings/server/startup.js b/app/channel-settings/server/startup.js index c2bab7b6376..be9f1e4fb0e 100644 --- a/app/channel-settings/server/startup.js +++ b/app/channel-settings/server/startup.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../models'; Meteor.startup(function() { Permissions.upsert('post-readonly', { $setOnInsert: { roles: ['admin', 'owner', 'moderator'] } }); diff --git a/app/chatpal-search/client/route.js b/app/chatpal-search/client/route.js index a6cb1c0a27d..74cf84c8673 100644 --- a/app/chatpal-search/client/route.js +++ b/app/chatpal-search/client/route.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { t } from '/app/utils'; +import { t } from '../../utils'; FlowRouter.route('/admin/chatpal', { name: 'chatpal-admin', diff --git a/app/chatpal-search/client/template/admin.js b/app/chatpal-search/client/template/admin.js index c2f9fabccd1..c4c2a201ae2 100644 --- a/app/chatpal-search/client/template/admin.js +++ b/app/chatpal-search/client/template/admin.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; +import { settings } from '../../../settings'; +import { hasRole } from '../../../authorization'; import toastr from 'toastr'; Template.ChatpalAdmin.onCreated(function() { diff --git a/app/chatpal-search/client/template/result.js b/app/chatpal-search/client/template/result.js index 8f23a601350..2202869e27f 100644 --- a/app/chatpal-search/client/template/result.js +++ b/app/chatpal-search/client/template/result.js @@ -1,10 +1,10 @@ -import { DateFormat } from '/app/lib'; +import { DateFormat } from '../../../lib'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { roomTypes } from '/app/utils'; -import { Subscriptions } from '/app/models'; +import { roomTypes } from '../../../utils'; +import { Subscriptions } from '../../../models'; Template.ChatpalSearchResultTemplate.onCreated(function() { this.badRequest = new ReactiveVar(false); diff --git a/app/chatpal-search/server/provider/index.js b/app/chatpal-search/server/provider/index.js index b55f23c52eb..66f8774d7e5 100644 --- a/app/chatpal-search/server/provider/index.js +++ b/app/chatpal-search/server/provider/index.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import ChatpalLogger from '../utils/logger'; import { Random } from 'meteor/random'; -import { Rooms, Messages } from '/app/models'; +import { Rooms, Messages } from '../../../models'; /** * Enables HTTP functions on Chatpal Backend diff --git a/app/chatpal-search/server/provider/provider.js b/app/chatpal-search/server/provider/provider.js index 84a0bcb78da..99561f5dfb4 100644 --- a/app/chatpal-search/server/provider/provider.js +++ b/app/chatpal-search/server/provider/provider.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { searchProviderService, SearchProvider } from '/app/search'; +import { searchProviderService, SearchProvider } from '../../../search'; import Index from './index'; import ChatpalLogger from '../utils/logger'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; /** * The chatpal search provider enables chatpal search. An appropriate backedn has to be specified by settings. diff --git a/app/chatpal-search/server/utils/logger.js b/app/chatpal-search/server/utils/logger.js index fef73682893..c1d75b806a2 100644 --- a/app/chatpal-search/server/utils/logger.js +++ b/app/chatpal-search/server/utils/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../../logger'; const ChatpalLogger = new Logger('Chatpal Logger', {}); export default ChatpalLogger; diff --git a/app/cloud/client/admin/cloud.js b/app/cloud/client/admin/cloud.js index e3354b35dd7..ea835f67720 100644 --- a/app/cloud/client/admin/cloud.js +++ b/app/cloud/client/admin/cloud.js @@ -3,7 +3,7 @@ import './cloud.html'; import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { t } from '/app/utils'; +import { t } from '../../../utils'; import queryString from 'query-string'; import toastr from 'toastr'; diff --git a/app/cloud/client/index.js b/app/cloud/client/index.js index 93e131a3df6..025d6a03940 100644 --- a/app/cloud/client/index.js +++ b/app/cloud/client/index.js @@ -3,8 +3,8 @@ import './admin/cloud'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { AdminBox } from '/app/ui-utils'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { AdminBox } from '../../ui-utils'; +import { hasAtLeastOnePermission } from '../../authorization'; FlowRouter.route('/admin/cloud', { name: 'cloud-config', diff --git a/app/cloud/server/functions/connectWorkspace.js b/app/cloud/server/functions/connectWorkspace.js index ca8adb03338..84b2d0f68d3 100644 --- a/app/cloud/server/functions/connectWorkspace.js +++ b/app/cloud/server/functions/connectWorkspace.js @@ -1,8 +1,8 @@ import querystring from 'querystring'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; +import { settings } from '../../../settings'; +import { Settings } from '../../../models'; import { getRedirectUri } from './getRedirectUri'; import { retrieveRegistrationStatus } from './retrieveRegistrationStatus'; diff --git a/app/cloud/server/functions/finishOAuthAuthorization.js b/app/cloud/server/functions/finishOAuthAuthorization.js index 96ff43b19ee..c6bb4b34328 100644 --- a/app/cloud/server/functions/finishOAuthAuthorization.js +++ b/app/cloud/server/functions/finishOAuthAuthorization.js @@ -2,8 +2,8 @@ import querystring from 'querystring'; import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { Settings, Users } from '/app/models'; +import { settings } from '../../../settings'; +import { Settings, Users } from '../../../models'; import { getRedirectUri } from './getRedirectUri'; diff --git a/app/cloud/server/functions/getOAuthAuthorizationUrl.js b/app/cloud/server/functions/getOAuthAuthorizationUrl.js index 580c6ab24f6..9da757fb9a2 100644 --- a/app/cloud/server/functions/getOAuthAuthorizationUrl.js +++ b/app/cloud/server/functions/getOAuthAuthorizationUrl.js @@ -1,6 +1,6 @@ import { Random } from 'meteor/random'; -import { Settings } from '/app/models'; -import { settings } from '/app/settings'; +import { Settings } from '../../../models'; +import { settings } from '../../../settings'; import { getRedirectUri } from './getRedirectUri'; diff --git a/app/cloud/server/functions/getRedirectUri.js b/app/cloud/server/functions/getRedirectUri.js index 68087434d66..754c8d4c89e 100644 --- a/app/cloud/server/functions/getRedirectUri.js +++ b/app/cloud/server/functions/getRedirectUri.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export function getRedirectUri() { return `${ settings.get('Site_Url') }/admin/cloud/oauth-callback`.replace(/\/\/admin+/g, '/admin'); diff --git a/app/cloud/server/functions/getWorkspaceAccessToken.js b/app/cloud/server/functions/getWorkspaceAccessToken.js index 49369d0de76..10e8af35f72 100644 --- a/app/cloud/server/functions/getWorkspaceAccessToken.js +++ b/app/cloud/server/functions/getWorkspaceAccessToken.js @@ -1,8 +1,8 @@ import querystring from 'querystring'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; +import { settings } from '../../../settings'; +import { Settings } from '../../../models'; import { getRedirectUri } from './getRedirectUri'; diff --git a/app/cloud/server/functions/getWorkspaceLicense.js b/app/cloud/server/functions/getWorkspaceLicense.js index 129def93840..2bb2ff0e533 100644 --- a/app/cloud/server/functions/getWorkspaceLicense.js +++ b/app/cloud/server/functions/getWorkspaceLicense.js @@ -1,6 +1,6 @@ import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; +import { settings } from '../../../settings'; +import { Settings } from '../../../models'; import { getWorkspaceAccessToken } from './getWorkspaceAccessToken'; diff --git a/app/cloud/server/functions/retrieveRegistrationStatus.js b/app/cloud/server/functions/retrieveRegistrationStatus.js index 33d82d5c221..2cc250927f6 100644 --- a/app/cloud/server/functions/retrieveRegistrationStatus.js +++ b/app/cloud/server/functions/retrieveRegistrationStatus.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { Users } from '/app/models'; +import { settings } from '../../../settings'; +import { Users } from '../../../models'; export function retrieveRegistrationStatus() { const info = { diff --git a/app/cloud/server/index.js b/app/cloud/server/index.js index 4887b91a1ab..6fde05af16b 100644 --- a/app/cloud/server/index.js +++ b/app/cloud/server/index.js @@ -2,7 +2,7 @@ import './methods'; import { getWorkspaceAccessToken } from './functions/getWorkspaceAccessToken'; import { getWorkspaceLicense } from './functions/getWorkspaceLicense'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../models'; if (Permissions) { Permissions.createOrUpdate('manage-cloud', ['admin']); diff --git a/app/cloud/server/methods.js b/app/cloud/server/methods.js index 3ef37549b61..843b908af07 100644 --- a/app/cloud/server/methods.js +++ b/app/cloud/server/methods.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../authorization'; +import { Settings } from '../../models'; import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStatus'; import { connectWorkspace } from './functions/connectWorkspace'; diff --git a/app/colors/client/client.js b/app/colors/client/client.js index 4f877b02760..d9a4dcc890b 100644 --- a/app/colors/client/client.js +++ b/app/colors/client/client.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import s from 'underscore.string'; // diff --git a/app/colors/server/settings.js b/app/colors/server/settings.js index d0ce21afc15..e2224144c34 100644 --- a/app/colors/server/settings.js +++ b/app/colors/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.add('HexColorPreview_Enabled', true, { type: 'boolean', diff --git a/app/cors/lib/common.js b/app/cors/lib/common.js index 584aa9d294c..bcfc13ea69f 100644 --- a/app/cors/lib/common.js +++ b/app/cors/lib/common.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.onload('Force_SSL', function(key, value) { diff --git a/app/cors/server/cors.js b/app/cors/server/cors.js index fab68a92e93..16d972f80d9 100644 --- a/app/cors/server/cors.js +++ b/app/cors/server/cors.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { WebApp, WebAppInternals } from 'meteor/webapp'; -import { settings } from '/app/settings'; -import { Logger } from '/app/logger'; +import { settings } from '../../settings'; +import { Logger } from '../../logger'; const logger = new Logger('CORS', {}); import _ from 'underscore'; diff --git a/app/crowd/server/crowd.js b/app/crowd/server/crowd.js index 066290684e1..e60a133a7d1 100644 --- a/app/crowd/server/crowd.js +++ b/app/crowd/server/crowd.js @@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor'; import { SHA256 } from 'meteor/sha'; import { SyncedCron } from 'meteor/littledata:synced-cron'; import { Accounts } from 'meteor/accounts-base'; -import { Logger } from '/app/logger'; -import { _setRealName } from '/app/lib'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; +import { Logger } from '../../logger'; +import { _setRealName } from '../../lib'; +import { Users } from '../../models'; +import { settings } from '../../settings'; +import { hasRole } from '../../authorization'; import _ from 'underscore'; const logger = new Logger('CROWD', {}); diff --git a/app/crowd/server/settings.js b/app/crowd/server/settings.js index 5e867b912eb..a82016b47a8 100644 --- a/app/crowd/server/settings.js +++ b/app/crowd/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('AtlassianCrowd', function() { diff --git a/app/custom-oauth/server/custom_oauth_server.js b/app/custom-oauth/server/custom_oauth_server.js index b459a222019..9276b5dfbab 100644 --- a/app/custom-oauth/server/custom_oauth_server.js +++ b/app/custom-oauth/server/custom_oauth_server.js @@ -4,8 +4,8 @@ import { Accounts } from 'meteor/accounts-base'; import { OAuth } from 'meteor/oauth'; import { HTTP } from 'meteor/http'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { Logger } from '/app/logger'; -import { Users } from '/app/models'; +import { Logger } from '../../logger'; +import { Users } from '../../models'; import _ from 'underscore'; const logger = new Logger('CustomOAuth'); diff --git a/app/custom-sounds/client/admin/adminSounds.js b/app/custom-sounds/client/admin/adminSounds.js index e6821bf1bed..80e25477512 100644 --- a/app/custom-sounds/client/admin/adminSounds.js +++ b/app/custom-sounds/client/admin/adminSounds.js @@ -1,9 +1,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; -import { RocketChatTabBar, SideNav, TabBar } from '/app/ui-utils'; +import { RocketChatTabBar, SideNav, TabBar } from '../../../ui-utils'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { CustomSounds } from '/app/models'; +import { CustomSounds } from '../../../models'; import s from 'underscore.string'; Template.adminSounds.helpers({ diff --git a/app/custom-sounds/client/admin/soundEdit.js b/app/custom-sounds/client/admin/soundEdit.js index 9a23448b7b5..3ebbeb66bfa 100644 --- a/app/custom-sounds/client/admin/soundEdit.js +++ b/app/custom-sounds/client/admin/soundEdit.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../utils'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/app/custom-sounds/client/admin/soundInfo.js b/app/custom-sounds/client/admin/soundInfo.js index e00a7d5d0f2..a15f03af6c0 100644 --- a/app/custom-sounds/client/admin/soundInfo.js +++ b/app/custom-sounds/client/admin/soundInfo.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../ui-utils'; +import { t, handleError } from '../../../utils'; Template.soundInfo.helpers({ name() { diff --git a/app/custom-sounds/client/admin/startup.js b/app/custom-sounds/client/admin/startup.js index 2c6243ec7c5..5d469ce5d45 100644 --- a/app/custom-sounds/client/admin/startup.js +++ b/app/custom-sounds/client/admin/startup.js @@ -1,5 +1,5 @@ -import { AdminBox } from '/app/ui-utils'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { AdminBox } from '../../../ui-utils'; +import { hasAtLeastOnePermission } from '../../../authorization'; AdminBox.addOption({ href: 'custom-sounds', diff --git a/app/custom-sounds/client/lib/CustomSounds.js b/app/custom-sounds/client/lib/CustomSounds.js index 5041d949838..79f477ae423 100644 --- a/app/custom-sounds/client/lib/CustomSounds.js +++ b/app/custom-sounds/client/lib/CustomSounds.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; import _ from 'underscore'; class CustomSoundsClass { diff --git a/app/custom-sounds/client/notifications/deleteCustomSound.js b/app/custom-sounds/client/notifications/deleteCustomSound.js index ed19596d6c0..b35063245c5 100644 --- a/app/custom-sounds/client/notifications/deleteCustomSound.js +++ b/app/custom-sounds/client/notifications/deleteCustomSound.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; -import { Notifications } from '/app/notifications'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; +import { Notifications } from '../../../notifications'; import { CustomSounds } from '../lib/CustomSounds'; Meteor.startup(() => diff --git a/app/custom-sounds/client/notifications/updateCustomSound.js b/app/custom-sounds/client/notifications/updateCustomSound.js index 7c27a917909..ab91a113d4a 100644 --- a/app/custom-sounds/client/notifications/updateCustomSound.js +++ b/app/custom-sounds/client/notifications/updateCustomSound.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; -import { Notifications } from '/app/notifications'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; +import { Notifications } from '../../../notifications'; import { CustomSounds } from '../lib/CustomSounds'; Meteor.startup(() => diff --git a/app/custom-sounds/server/methods/deleteCustomSound.js b/app/custom-sounds/server/methods/deleteCustomSound.js index 681096d6219..9057f752ce1 100644 --- a/app/custom-sounds/server/methods/deleteCustomSound.js +++ b/app/custom-sounds/server/methods/deleteCustomSound.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { CustomSounds } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { Notifications } from '/app/notifications'; +import { CustomSounds } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { Notifications } from '../../../notifications'; import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds'; Meteor.methods({ diff --git a/app/custom-sounds/server/methods/insertOrUpdateSound.js b/app/custom-sounds/server/methods/insertOrUpdateSound.js index 4475fc42833..2e0a61395e3 100644 --- a/app/custom-sounds/server/methods/insertOrUpdateSound.js +++ b/app/custom-sounds/server/methods/insertOrUpdateSound.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { CustomSounds } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../../authorization'; +import { CustomSounds } from '../../../models'; +import { Notifications } from '../../../notifications'; import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds'; import s from 'underscore.string'; diff --git a/app/custom-sounds/server/methods/listCustomSounds.js b/app/custom-sounds/server/methods/listCustomSounds.js index 82b8a3d893d..05a72f0a03d 100644 --- a/app/custom-sounds/server/methods/listCustomSounds.js +++ b/app/custom-sounds/server/methods/listCustomSounds.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { CustomSounds } from '/app/models'; +import { CustomSounds } from '../../../models'; Meteor.methods({ listCustomSounds() { diff --git a/app/custom-sounds/server/methods/uploadCustomSound.js b/app/custom-sounds/server/methods/uploadCustomSound.js index 007a086c54a..04c57c8dc31 100644 --- a/app/custom-sounds/server/methods/uploadCustomSound.js +++ b/app/custom-sounds/server/methods/uploadCustomSound.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Notifications } from '/app/notifications'; -import { RocketChatFile } from '/app/file'; +import { hasPermission } from '../../../authorization'; +import { Notifications } from '../../../notifications'; +import { RocketChatFile } from '../../../file'; import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds'; Meteor.methods({ diff --git a/app/custom-sounds/server/publications/customSounds.js b/app/custom-sounds/server/publications/customSounds.js index e6a01f7284b..31163a5076b 100644 --- a/app/custom-sounds/server/publications/customSounds.js +++ b/app/custom-sounds/server/publications/customSounds.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { CustomSounds } from '/app/models'; +import { CustomSounds } from '../../../models'; import s from 'underscore.string'; Meteor.publish('customSounds', function(filter, limit) { diff --git a/app/custom-sounds/server/startup/custom-sounds.js b/app/custom-sounds/server/startup/custom-sounds.js index fbef6fe7318..934798cb170 100644 --- a/app/custom-sounds/server/startup/custom-sounds.js +++ b/app/custom-sounds/server/startup/custom-sounds.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { RocketChatFile } from '/app/file'; -import { settings } from '/app/settings'; +import { RocketChatFile } from '../../../file'; +import { settings } from '../../../settings'; import _ from 'underscore'; export let RocketChatFileCustomSoundsInstance; diff --git a/app/custom-sounds/server/startup/permissions.js b/app/custom-sounds/server/startup/permissions.js index a34a476cfd3..fc27ecb7989 100644 --- a/app/custom-sounds/server/startup/permissions.js +++ b/app/custom-sounds/server/startup/permissions.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../../models'; Meteor.startup(() => { if (Permissions) { diff --git a/app/custom-sounds/server/startup/settings.js b/app/custom-sounds/server/startup/settings.js index 7caf0b34c22..442288baae3 100644 --- a/app/custom-sounds/server/startup/settings.js +++ b/app/custom-sounds/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('CustomSoundsFilesystem', function() { this.add('CustomSounds_Storage_Type', 'GridFS', { diff --git a/app/dolphin/lib/common.js b/app/dolphin/lib/common.js index 5782930b6cf..8f03378319b 100644 --- a/app/dolphin/lib/common.js +++ b/app/dolphin/lib/common.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { CustomOAuth } from '/app/custom-oauth'; -import { callbacks } from '/app/callbacks'; -import { Settings } from '/app/models'; +import { CustomOAuth } from '../../custom-oauth'; +import { callbacks } from '../../callbacks'; +import { Settings } from '../../models'; const config = { serverURL: '', diff --git a/app/dolphin/server/startup.js b/app/dolphin/server/startup.js index 2c211ead3e1..028066eb850 100644 --- a/app/dolphin/server/startup.js +++ b/app/dolphin/server/startup.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.add('Accounts_OAuth_Dolphin_URL', '', { type: 'string', group: 'OAuth', public: true, section: 'Dolphin', i18nLabel: 'URL' }); settings.add('Accounts_OAuth_Dolphin', false, { type: 'boolean', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Enable' }); diff --git a/app/drupal/lib/common.js b/app/drupal/lib/common.js index 13f47bfc0dc..b7b5770e7dd 100644 --- a/app/drupal/lib/common.js +++ b/app/drupal/lib/common.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { CustomOAuth } from '/app/custom-oauth'; +import { settings } from '../../settings'; +import { CustomOAuth } from '../../custom-oauth'; // Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal // In RocketChat -> Administration the URL needs to be http(s)://{drupal.server}/ diff --git a/app/drupal/server/startup.js b/app/drupal/server/startup.js index f90c84021b7..d13388b44d9 100644 --- a/app/drupal/server/startup.js +++ b/app/drupal/server/startup.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('OAuth', function() { this.section('Drupal', function() { diff --git a/app/e2e/client/accountEncryption.js b/app/e2e/client/accountEncryption.js index 46a373b03e3..4632b064a84 100644 --- a/app/e2e/client/accountEncryption.js +++ b/app/e2e/client/accountEncryption.js @@ -2,9 +2,9 @@ import { Template } from 'meteor/templating'; import { ReactiveVar } from 'meteor/reactive-var'; import toastr from 'toastr'; import s from 'underscore.string'; -import { settings } from '/app/settings'; -import { t } from '/app/utils'; -import { e2e } from '/app/e2e'; +import { settings } from '../../settings'; +import { t } from '../../utils'; +import { e2e } from '..'; Template.accountEncryption.helpers({ isEnabled() { diff --git a/app/e2e/client/events.js b/app/e2e/client/events.js index be9f825b44c..cfa22a5bbf8 100644 --- a/app/e2e/client/events.js +++ b/app/e2e/client/events.js @@ -1,5 +1,5 @@ import { Accounts } from 'meteor/accounts-base'; -import { e2e } from '/app/e2e'; +import { e2e } from '..'; Accounts.onLogout(() => { e2e.stopClient(); diff --git a/app/e2e/client/rocketchat.e2e.js b/app/e2e/client/rocketchat.e2e.js index a5304e08737..a7b3733bc4f 100644 --- a/app/e2e/client/rocketchat.e2e.js +++ b/app/e2e/client/rocketchat.e2e.js @@ -4,11 +4,11 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { EJSON } from 'meteor/ejson'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { Rooms, Subscriptions, Messages } from '/app/models'; -import { promises } from '/app/promises'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { Layout, call, modal, alerts } from '/app/ui-utils'; +import { Rooms, Subscriptions, Messages } from '../../models'; +import { promises } from '../../promises'; +import { settings } from '../../settings'; +import { Notifications } from '../../notifications'; +import { Layout, call, modal, alerts } from '../../ui-utils'; import { TAPi18n } from 'meteor/tap:i18n'; import { E2ERoom } from './rocketchat.e2e.room'; import { diff --git a/app/e2e/client/rocketchat.e2e.room.js b/app/e2e/client/rocketchat.e2e.room.js index 46ef4c116b8..549791cbe51 100644 --- a/app/e2e/client/rocketchat.e2e.room.js +++ b/app/e2e/client/rocketchat.e2e.room.js @@ -5,9 +5,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { EJSON } from 'meteor/ejson'; import { Random } from 'meteor/random'; import { TimeSync } from 'meteor/mizzao:timesync'; -import { Notifications } from '/app/notifications'; -import { Rooms, Subscriptions } from '/app/models'; -import { call } from '/app/ui-utils'; +import { Notifications } from '../../notifications'; +import { Rooms, Subscriptions } from '../../models'; +import { call } from '../../ui-utils'; import { e2e } from './rocketchat.e2e'; import { Deferred, diff --git a/app/e2e/client/tabbar.js b/app/e2e/client/tabbar.js index 2029d1ac79b..21edfaadafe 100644 --- a/app/e2e/client/tabbar.js +++ b/app/e2e/client/tabbar.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { hasAllPermission } from '/app/authorization'; -import { call, TabBar } from '/app/ui-utils'; -import { ChatRoom } from '/app/models'; +import { hasAllPermission } from '../../authorization'; +import { call, TabBar } from '../../ui-utils'; +import { ChatRoom } from '../../models'; Meteor.startup(() => { TabBar.addButton({ diff --git a/app/e2e/server/index.js b/app/e2e/server/index.js index cd44986c3ae..fdf3db07c92 100644 --- a/app/e2e/server/index.js +++ b/app/e2e/server/index.js @@ -1,5 +1,5 @@ -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; +import { callbacks } from '../../callbacks'; +import { Notifications } from '../../notifications'; import './settings'; import './methods/setUserPublicAndPivateKeys'; diff --git a/app/e2e/server/methods/fetchMyKeys.js b/app/e2e/server/methods/fetchMyKeys.js index fb71f0270ce..5777b16e7e0 100644 --- a/app/e2e/server/methods/fetchMyKeys.js +++ b/app/e2e/server/methods/fetchMyKeys.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; Meteor.methods({ 'e2e.fetchMyKeys'() { diff --git a/app/e2e/server/methods/getUsersOfRoomWithoutKey.js b/app/e2e/server/methods/getUsersOfRoomWithoutKey.js index f79961ce0b2..eb448b098e9 100644 --- a/app/e2e/server/methods/getUsersOfRoomWithoutKey.js +++ b/app/e2e/server/methods/getUsersOfRoomWithoutKey.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions, Users } from '/app/models'; +import { Subscriptions, Users } from '../../../models'; Meteor.methods({ 'e2e.getUsersOfRoomWithoutKey'(rid) { diff --git a/app/e2e/server/methods/requestSubscriptionKeys.js b/app/e2e/server/methods/requestSubscriptionKeys.js index 9a4ca1ca3e6..c3b42675e97 100644 --- a/app/e2e/server/methods/requestSubscriptionKeys.js +++ b/app/e2e/server/methods/requestSubscriptionKeys.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions, Rooms } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { Subscriptions, Rooms } from '../../../models'; +import { Notifications } from '../../../notifications'; Meteor.methods({ 'e2e.requestSubscriptionKeys'() { diff --git a/app/e2e/server/methods/resetUserE2EKey.js b/app/e2e/server/methods/resetUserE2EKey.js index c699f6dd300..f48ca2f0a58 100644 --- a/app/e2e/server/methods/resetUserE2EKey.js +++ b/app/e2e/server/methods/resetUserE2EKey.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Subscriptions } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Users, Subscriptions } from '../../../models'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ 'e2e.resetUserE2EKey'(userId) { diff --git a/app/e2e/server/methods/setRoomKeyID.js b/app/e2e/server/methods/setRoomKeyID.js index b5583596a3e..dfcc04a8b73 100644 --- a/app/e2e/server/methods/setRoomKeyID.js +++ b/app/e2e/server/methods/setRoomKeyID.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; Meteor.methods({ 'e2e.setRoomKeyID'(rid, keyID) { diff --git a/app/e2e/server/methods/setUserPublicAndPivateKeys.js b/app/e2e/server/methods/setUserPublicAndPivateKeys.js index 4b27eb11c76..42ca627f3b1 100644 --- a/app/e2e/server/methods/setUserPublicAndPivateKeys.js +++ b/app/e2e/server/methods/setUserPublicAndPivateKeys.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; Meteor.methods({ 'e2e.setUserPublicAndPivateKeys'({ public_key, private_key }) { diff --git a/app/e2e/server/methods/updateGroupKey.js b/app/e2e/server/methods/updateGroupKey.js index 1898d84a200..18471e38c9a 100644 --- a/app/e2e/server/methods/updateGroupKey.js +++ b/app/e2e/server/methods/updateGroupKey.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; Meteor.methods({ 'e2e.updateGroupKey'(rid, uid, key) { diff --git a/app/e2e/server/settings.js b/app/e2e/server/settings.js index 53aaf133193..2d9b508e476 100644 --- a/app/e2e/server/settings.js +++ b/app/e2e/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('E2E Encryption', function() { this.add('E2E_Enable', false, { diff --git a/app/emoji-custom/client/admin/adminEmoji.js b/app/emoji-custom/client/admin/adminEmoji.js index e34c0509f25..d18d6141157 100644 --- a/app/emoji-custom/client/admin/adminEmoji.js +++ b/app/emoji-custom/client/admin/adminEmoji.js @@ -1,7 +1,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; -import { RocketChatTabBar, SideNav, TabBar } from '/app/ui-utils'; +import { RocketChatTabBar, SideNav, TabBar } from '../../../ui-utils'; import { Tracker } from 'meteor/tracker'; -import { EmojiCustom } from '/app/models'; +import { EmojiCustom } from '../../../models'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import s from 'underscore.string'; diff --git a/app/emoji-custom/client/admin/emojiEdit.js b/app/emoji-custom/client/admin/emojiEdit.js index 1cab1516dd9..e112e2ecec8 100644 --- a/app/emoji-custom/client/admin/emojiEdit.js +++ b/app/emoji-custom/client/admin/emojiEdit.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../utils'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/app/emoji-custom/client/admin/emojiInfo.js b/app/emoji-custom/client/admin/emojiInfo.js index 4b2d1f0aac9..91d43e45807 100644 --- a/app/emoji-custom/client/admin/emojiInfo.js +++ b/app/emoji-custom/client/admin/emojiInfo.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { handleError, t } from '/app/utils'; -import { modal } from '/app/ui-utils'; +import { handleError, t } from '../../../utils'; +import { modal } from '../../../ui-utils'; Template.emojiInfo.helpers({ name() { diff --git a/app/emoji-custom/client/admin/startup.js b/app/emoji-custom/client/admin/startup.js index 1dab335c6e1..2845727615d 100644 --- a/app/emoji-custom/client/admin/startup.js +++ b/app/emoji-custom/client/admin/startup.js @@ -1,5 +1,5 @@ -import { AdminBox } from '/app/ui-utils'; -import { hasPermission } from '/app/authorization'; +import { AdminBox } from '../../../ui-utils'; +import { hasPermission } from '../../../authorization'; AdminBox.addOption({ href: 'emoji-custom', diff --git a/app/emoji-custom/client/lib/emojiCustom.js b/app/emoji-custom/client/lib/emojiCustom.js index 482f9b9e04d..ad96b6796c3 100644 --- a/app/emoji-custom/client/lib/emojiCustom.js +++ b/app/emoji-custom/client/lib/emojiCustom.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Session } from 'meteor/session'; import { isSetNotNull } from '../lib/function-isSet'; -import { RoomManager, call } from '/app/ui-utils'; -import { emoji, EmojiPicker } from '/app/emoji'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { RoomManager, call } from '../../../ui-utils'; +import { emoji, EmojiPicker } from '../../../emoji'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; export const getEmojiUrlFromName = function(name, extension) { Session.get; diff --git a/app/emoji-custom/client/notifications/deleteEmojiCustom.js b/app/emoji-custom/client/notifications/deleteEmojiCustom.js index b77e7a8b407..ecdb80e417d 100644 --- a/app/emoji-custom/client/notifications/deleteEmojiCustom.js +++ b/app/emoji-custom/client/notifications/deleteEmojiCustom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Notifications } from '/app/notifications'; +import { Notifications } from '../../../notifications'; import { deleteEmojiCustom } from '../lib/emojiCustom'; Meteor.startup(() => diff --git a/app/emoji-custom/client/notifications/updateEmojiCustom.js b/app/emoji-custom/client/notifications/updateEmojiCustom.js index 28c060cd4c6..338ccbbc726 100644 --- a/app/emoji-custom/client/notifications/updateEmojiCustom.js +++ b/app/emoji-custom/client/notifications/updateEmojiCustom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Notifications } from '/app/notifications'; +import { Notifications } from '../../../notifications'; import { updateEmojiCustom } from '../lib/emojiCustom'; Meteor.startup(() => diff --git a/app/emoji-custom/server/methods/deleteEmojiCustom.js b/app/emoji-custom/server/methods/deleteEmojiCustom.js index 45c84155038..02c80d6ce36 100644 --- a/app/emoji-custom/server/methods/deleteEmojiCustom.js +++ b/app/emoji-custom/server/methods/deleteEmojiCustom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { EmojiCustom } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../../authorization'; +import { EmojiCustom } from '../../../models'; +import { Notifications } from '../../../notifications'; import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; Meteor.methods({ diff --git a/app/emoji-custom/server/methods/insertOrUpdateEmoji.js b/app/emoji-custom/server/methods/insertOrUpdateEmoji.js index 6ca5021368d..32b7c1f7f60 100644 --- a/app/emoji-custom/server/methods/insertOrUpdateEmoji.js +++ b/app/emoji-custom/server/methods/insertOrUpdateEmoji.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Notifications } from '/app/notifications'; -import { EmojiCustom } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Notifications } from '../../../notifications'; +import { EmojiCustom } from '../../../models'; import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/emoji-custom/server/methods/listEmojiCustom.js b/app/emoji-custom/server/methods/listEmojiCustom.js index 1b6436ddab1..1c7f0072bc8 100644 --- a/app/emoji-custom/server/methods/listEmojiCustom.js +++ b/app/emoji-custom/server/methods/listEmojiCustom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { EmojiCustom } from '/app/models'; +import { EmojiCustom } from '../../../models'; Meteor.methods({ listEmojiCustom(options = {}) { diff --git a/app/emoji-custom/server/methods/uploadEmojiCustom.js b/app/emoji-custom/server/methods/uploadEmojiCustom.js index 94a27623296..b32173c17ef 100644 --- a/app/emoji-custom/server/methods/uploadEmojiCustom.js +++ b/app/emoji-custom/server/methods/uploadEmojiCustom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Notifications } from '/app/notifications'; -import { hasPermission } from '/app/authorization'; -import { RocketChatFile } from '/app/file'; +import { Notifications } from '../../../notifications'; +import { hasPermission } from '../../../authorization'; +import { RocketChatFile } from '../../../file'; import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; Meteor.methods({ diff --git a/app/emoji-custom/server/publications/fullEmojiData.js b/app/emoji-custom/server/publications/fullEmojiData.js index 9290567eb82..6d49ceb42cc 100644 --- a/app/emoji-custom/server/publications/fullEmojiData.js +++ b/app/emoji-custom/server/publications/fullEmojiData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { EmojiCustom } from '/app/models'; +import { EmojiCustom } from '../../../models'; import s from 'underscore.string'; Meteor.publish('fullEmojiData', function(filter, limit) { diff --git a/app/emoji-custom/server/startup/emoji-custom.js b/app/emoji-custom/server/startup/emoji-custom.js index 2d54d277f77..807f67b7295 100644 --- a/app/emoji-custom/server/startup/emoji-custom.js +++ b/app/emoji-custom/server/startup/emoji-custom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; -import { RocketChatFile } from '/app/file'; +import { settings } from '../../../settings'; +import { RocketChatFile } from '../../../file'; import _ from 'underscore'; export let RocketChatFileEmojiCustomInstance; diff --git a/app/emoji-custom/server/startup/settings.js b/app/emoji-custom/server/startup/settings.js index d7b95eb6769..9b6d84a2931 100644 --- a/app/emoji-custom/server/startup/settings.js +++ b/app/emoji-custom/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('EmojiCustomFilesystem', function() { this.add('EmojiUpload_Storage_Type', 'GridFS', { diff --git a/app/emoji-emojione/lib/rocketchat.js b/app/emoji-emojione/lib/rocketchat.js index 704bf463967..b3ce738c157 100644 --- a/app/emoji-emojione/lib/rocketchat.js +++ b/app/emoji-emojione/lib/rocketchat.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { emoji } from '/app/emoji'; -import { getUserPreference } from '/app/utils'; +import { emoji } from '../../emoji'; +import { getUserPreference } from '../../utils'; import { emojione } from 'meteor/emojione:emojione'; import { emojisByCategory, emojiCategories, toneList } from './emojiPicker'; diff --git a/app/emoji-emojione/server/callbacks.js b/app/emoji-emojione/server/callbacks.js index 5304a8703bf..36a374c967e 100644 --- a/app/emoji-emojione/server/callbacks.js +++ b/app/emoji-emojione/server/callbacks.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import { emojione } from 'meteor/emojione:emojione'; Meteor.startup(function() { diff --git a/app/emoji/client/emojiParser.js b/app/emoji/client/emojiParser.js index 34c5ca40395..ff1a7b3dee1 100644 --- a/app/emoji/client/emojiParser.js +++ b/app/emoji/client/emojiParser.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { getUserPreference } from '/app/utils'; -import { callbacks } from '/app/callbacks'; +import { getUserPreference } from '../../utils'; +import { callbacks } from '../../callbacks'; import { emoji } from '../lib/rocketchat'; import { isSetNotNull } from './function-isSet'; import s from 'underscore.string'; diff --git a/app/error-handler/server/lib/RocketChat.ErrorHandler.js b/app/error-handler/server/lib/RocketChat.ErrorHandler.js index bc2e6b050e8..ee6845ebafe 100644 --- a/app/error-handler/server/lib/RocketChat.ErrorHandler.js +++ b/app/error-handler/server/lib/RocketChat.ErrorHandler.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Users, Rooms } from '/app/models'; -import { sendMessage } from '/app/lib'; +import { settings } from '../../../settings'; +import { Users, Rooms } from '../../../models'; +import { sendMessage } from '../../../lib'; class ErrorHandler { constructor() { diff --git a/app/error-handler/server/startup/settings.js b/app/error-handler/server/startup/settings.js index 74a3cfa76fb..77421c3fb2a 100644 --- a/app/error-handler/server/startup/settings.js +++ b/app/error-handler/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('Logs', function() { this.add('Log_Exceptions_to_Channel', '', { type: 'string' }); diff --git a/app/federation/server/federatedResources/FederatedMessage.js b/app/federation/server/federatedResources/FederatedMessage.js index 7254997ef35..dfd9bb86055 100644 --- a/app/federation/server/federatedResources/FederatedMessage.js +++ b/app/federation/server/federatedResources/FederatedMessage.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { sendMessage, updateMessage } from '/app/lib'; -import { Messages, Rooms, Users } from '/app/models'; -import { FileUpload } from '/app/file-upload'; +import { sendMessage, updateMessage } from '../../../lib'; +import { Messages, Rooms, Users } from '../../../models'; +import { FileUpload } from '../../../file-upload'; import FederatedResource from './FederatedResource'; import FederatedRoom from './FederatedRoom'; diff --git a/app/federation/server/federatedResources/FederatedRoom.js b/app/federation/server/federatedResources/FederatedRoom.js index b63bb0f0a22..ac1e7b47a1d 100644 --- a/app/federation/server/federatedResources/FederatedRoom.js +++ b/app/federation/server/federatedResources/FederatedRoom.js @@ -1,5 +1,5 @@ -import { createRoom } from '/app/lib'; -import { Rooms, Subscriptions, Users } from '/app/models'; +import { createRoom } from '../../../lib'; +import { Rooms, Subscriptions, Users } from '../../../models'; import FederatedResource from './FederatedResource'; import FederatedUser from './FederatedUser'; diff --git a/app/federation/server/federatedResources/FederatedUser.js b/app/federation/server/federatedResources/FederatedUser.js index d796fe04947..41d431ddab8 100644 --- a/app/federation/server/federatedResources/FederatedUser.js +++ b/app/federation/server/federatedResources/FederatedUser.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../models'; import FederatedResource from './FederatedResource'; diff --git a/app/federation/server/federation-settings.js b/app/federation/server/federation-settings.js index d365bb889fc..5e507774b28 100644 --- a/app/federation/server/federation-settings.js +++ b/app/federation/server/federation-settings.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { FederationKeys } from '/app/models'; +import { settings } from '../../settings'; +import { FederationKeys } from '../../models'; Meteor.startup(function() { // const federationUniqueId = FederationKeys.getUniqueId(); diff --git a/app/federation/server/logger.js b/app/federation/server/logger.js index c19a4363845..36e915c2813 100644 --- a/app/federation/server/logger.js +++ b/app/federation/server/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; export const logger = new Logger('Federation', { sections: { diff --git a/app/federation/server/main.js b/app/federation/server/main.js index 49df1245123..10027e63674 100644 --- a/app/federation/server/main.js +++ b/app/federation/server/main.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { _ } from 'meteor/underscore'; -import { settings } from '/app/settings'; -import { FederationKeys } from '/app/models'; -import { getWorkspaceAccessToken } from '/app/cloud'; +import { settings } from '../../settings'; +import { FederationKeys } from '../../models'; +import { getWorkspaceAccessToken } from '../../cloud'; import './federation-settings'; import './methods'; diff --git a/app/federation/server/methods/federationAddUser.js b/app/federation/server/methods/federationAddUser.js index 4b1bdee61ae..c4c5b601282 100644 --- a/app/federation/server/methods/federationAddUser.js +++ b/app/federation/server/methods/federationAddUser.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { logger } from '../logger'; import peerClient from '../peerClient'; diff --git a/app/federation/server/peerClient.js b/app/federation/server/peerClient.js index e9f1b419b01..53b2f627190 100644 --- a/app/federation/server/peerClient.js +++ b/app/federation/server/peerClient.js @@ -1,8 +1,8 @@ import qs from 'querystring'; import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '/app/models'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; +import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models'; import { Federation } from './main'; import peerDNS from './peerDNS'; diff --git a/app/federation/server/peerDNS.js b/app/federation/server/peerDNS.js index ab610db7aac..75e999703be 100644 --- a/app/federation/server/peerDNS.js +++ b/app/federation/server/peerDNS.js @@ -1,6 +1,6 @@ import dns from 'dns'; import { Meteor } from 'meteor/meteor'; -import { FederationDNSCache } from '/app/models'; +import { FederationDNSCache } from '../../models'; import { logger } from './logger'; import peerHTTP from './peerHTTP'; diff --git a/app/federation/server/peerServer/peerServer.js b/app/federation/server/peerServer/peerServer.js index 853239af517..6cc44ac25a0 100644 --- a/app/federation/server/peerServer/peerServer.js +++ b/app/federation/server/peerServer/peerServer.js @@ -1,7 +1,7 @@ -import { callbacks } from '/app/callbacks'; -import { setReaction } from '/app/reactions'; -import { addUserToRoom, removeUserFromRoom, deleteMessage } from '/app/lib'; -import { Rooms, Subscriptions } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { setReaction } from '../../../reactions'; +import { addUserToRoom, removeUserFromRoom, deleteMessage } from '../../../lib'; +import { Rooms, Subscriptions } from '../../../models'; import { FederatedMessage, FederatedRoom, FederatedUser } from '../federatedResources'; import { logger } from '../logger.js'; diff --git a/app/federation/server/peerServer/routes/events.js b/app/federation/server/peerServer/routes/events.js index 602e6863f74..eeb2176032f 100644 --- a/app/federation/server/peerServer/routes/events.js +++ b/app/federation/server/peerServer/routes/events.js @@ -1,5 +1,5 @@ -import { API } from '/app/api'; -import { FederationKeys } from '/app/models'; +import { API } from '../../../../api'; +import { FederationKeys } from '../../../../models'; import { Federation } from '../../main'; diff --git a/app/federation/server/peerServer/routes/uploads.js b/app/federation/server/peerServer/routes/uploads.js index c404dce9659..5efd8e2c368 100644 --- a/app/federation/server/peerServer/routes/uploads.js +++ b/app/federation/server/peerServer/routes/uploads.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { API } from '/app/api'; -import { Uploads } from '/app/models'; -import { FileUpload } from '/app/file-upload'; +import { API } from '../../../../api'; +import { Uploads } from '../../../../models'; +import { FileUpload } from '../../../../file-upload'; import peerServer from '../peerServer'; diff --git a/app/federation/server/peerServer/routes/users.js b/app/federation/server/peerServer/routes/users.js index 54c96e2ec14..d20cee692d0 100644 --- a/app/federation/server/peerServer/routes/users.js +++ b/app/federation/server/peerServer/routes/users.js @@ -1,5 +1,5 @@ -import { API } from '/app/api'; -import { Users } from '/app/models'; +import { API } from '../../../../api'; +import { Users } from '../../../../models'; import { FederatedUser } from '../../federatedResources'; import peerServer from '../peerServer'; diff --git a/app/federation/server/settingsUpdater.js b/app/federation/server/settingsUpdater.js index 7031851d2fc..344d6545e95 100644 --- a/app/federation/server/settingsUpdater.js +++ b/app/federation/server/settingsUpdater.js @@ -1,4 +1,4 @@ -import { Settings } from '/app/models'; +import { Settings } from '../../models'; let nextStatus; diff --git a/app/file-upload/client/lib/fileUploadHandler.js b/app/file-upload/client/lib/fileUploadHandler.js index 1f9f771b8b8..f090356be40 100644 --- a/app/file-upload/client/lib/fileUploadHandler.js +++ b/app/file-upload/client/lib/fileUploadHandler.js @@ -3,7 +3,7 @@ import { Accounts } from 'meteor/accounts-base'; import { Tracker } from 'meteor/tracker'; import { UploadFS } from 'meteor/jalik:ufs'; import { FileUploadBase } from '../../lib/FileUploadBase'; -import { Uploads, Avatars } from '/app/models'; +import { Uploads, Avatars } from '../../../models'; import { FileUpload } from '../../lib/FileUpload'; new UploadFS.Store({ diff --git a/app/file-upload/lib/FileUpload.js b/app/file-upload/lib/FileUpload.js index 904faa71e1f..e8baa971549 100644 --- a/app/file-upload/lib/FileUpload.js +++ b/app/file-upload/lib/FileUpload.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Settings } from '/app/models'; -import { settings } from '/app/settings'; -import { fileUploadIsValidContentType } from '/app/utils'; -import { canAccessRoom } from '/app/authorization'; +import { Rooms, Settings } from '../../models'; +import { settings } from '../../settings'; +import { fileUploadIsValidContentType } from '../../utils'; +import { canAccessRoom } from '../../authorization'; import filesize from 'filesize'; let maxFileSize = 0; diff --git a/app/file-upload/lib/FileUploadBase.js b/app/file-upload/lib/FileUploadBase.js index 5999aec2860..a8ffd7fa572 100644 --- a/app/file-upload/lib/FileUploadBase.js +++ b/app/file-upload/lib/FileUploadBase.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { UploadFS } from 'meteor/jalik:ufs'; -import { canAccessRoom, hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { canAccessRoom, hasPermission } from '../../authorization'; +import { settings } from '../../settings'; import _ from 'underscore'; UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({ diff --git a/app/file-upload/server/config/AmazonS3.js b/app/file-upload/server/config/AmazonS3.js index b342084ca5c..c5d140de939 100644 --- a/app/file-upload/server/config/AmazonS3.js +++ b/app/file-upload/server/config/AmazonS3.js @@ -1,5 +1,5 @@ import _ from 'underscore'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { FileUploadClass } from '../lib/FileUpload'; import { FileUpload } from '../lib/FileUpload'; import '../../ufs/AmazonS3/server.js'; diff --git a/app/file-upload/server/config/FileSystem.js b/app/file-upload/server/config/FileSystem.js index b1a8c3230a1..e9b3b003c02 100644 --- a/app/file-upload/server/config/FileSystem.js +++ b/app/file-upload/server/config/FileSystem.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { UploadFS } from 'meteor/jalik:ufs'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; import fs from 'fs'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; diff --git a/app/file-upload/server/config/GoogleStorage.js b/app/file-upload/server/config/GoogleStorage.js index bfbb0be36b5..fb35424852b 100644 --- a/app/file-upload/server/config/GoogleStorage.js +++ b/app/file-upload/server/config/GoogleStorage.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import '../../ufs/GoogleStorage/server.js'; import http from 'http'; import https from 'https'; diff --git a/app/file-upload/server/config/GridFS.js b/app/file-upload/server/config/GridFS.js index 557a79d4772..f849d77b009 100644 --- a/app/file-upload/server/config/GridFS.js +++ b/app/file-upload/server/config/GridFS.js @@ -2,7 +2,7 @@ import { UploadFS } from 'meteor/jalik:ufs'; import stream from 'stream'; import zlib from 'zlib'; import util from 'util'; -import { Logger } from '/app/logger'; +import { Logger } from '../../../logger'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; const logger = new Logger('FileUpload'); diff --git a/app/file-upload/server/config/Webdav.js b/app/file-upload/server/config/Webdav.js index 03b6e6d082e..84d2e00ce39 100644 --- a/app/file-upload/server/config/Webdav.js +++ b/app/file-upload/server/config/Webdav.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { FileUploadClass, FileUpload } from '../lib/FileUpload'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import '../../ufs/Webdav/server.js'; const get = function(file, req, res) { diff --git a/app/file-upload/server/config/_configUploadStorage.js b/app/file-upload/server/config/_configUploadStorage.js index 05d85eae802..f3940013903 100644 --- a/app/file-upload/server/config/_configUploadStorage.js +++ b/app/file-upload/server/config/_configUploadStorage.js @@ -1,5 +1,5 @@ import { UploadFS } from 'meteor/jalik:ufs'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; import './AmazonS3.js'; import './FileSystem.js'; diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js index 01cf063b488..792df542467 100644 --- a/app/file-upload/server/lib/FileUpload.js +++ b/app/file-upload/server/lib/FileUpload.js @@ -7,11 +7,11 @@ import Future from 'fibers/future'; import sharp from 'sharp'; import { Cookies } from 'meteor/ostrio:cookies'; import { UploadFS } from 'meteor/jalik:ufs'; -import { settings } from '/app/settings'; -import * as Models from '/app/models'; +import { settings } from '../../../settings'; +import * as Models from '../../../models'; import { FileUpload as _FileUpload } from '../../lib/FileUpload'; -import { roomTypes } from '/app/utils'; -import { hasPermission } from '/app/authorization'; +import { roomTypes } from '../../../utils'; +import { hasPermission } from '../../../authorization'; const cookie = new Cookies(); diff --git a/app/file-upload/server/lib/proxy.js b/app/file-upload/server/lib/proxy.js index 93f6cd7c9b3..f193d8ec97c 100644 --- a/app/file-upload/server/lib/proxy.js +++ b/app/file-upload/server/lib/proxy.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; import { UploadFS } from 'meteor/jalik:ufs'; import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; -import { Logger } from '/app/logger'; -import { isDocker } from '/app/utils'; +import { Logger } from '../../../logger'; +import { isDocker } from '../../../utils'; import http from 'http'; import URL from 'url'; diff --git a/app/file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js index 63c59ea43f3..8a6632b946a 100644 --- a/app/file-upload/server/lib/requests.js +++ b/app/file-upload/server/lib/requests.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { Uploads } from '/app/models'; +import { Uploads } from '../../../models'; import { FileUpload } from './FileUpload'; WebApp.connectHandlers.use('/file-upload/', function(req, res, next) { diff --git a/app/file-upload/server/methods/getS3FileUrl.js b/app/file-upload/server/methods/getS3FileUrl.js index 238e62674f4..9c68fa54832 100644 --- a/app/file-upload/server/methods/getS3FileUrl.js +++ b/app/file-upload/server/methods/getS3FileUrl.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { UploadFS } from 'meteor/jalik:ufs'; -import { settings } from '/app/settings'; -import { Uploads } from '/app/models'; +import { settings } from '../../../settings'; +import { Uploads } from '../../../models'; let protectedFiles; diff --git a/app/file-upload/server/methods/sendFileMessage.js b/app/file-upload/server/methods/sendFileMessage.js index e83f848fb48..84072c62525 100644 --- a/app/file-upload/server/methods/sendFileMessage.js +++ b/app/file-upload/server/methods/sendFileMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; -import { Uploads } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Uploads } from '../../../models'; +import { callbacks } from '../../../callbacks'; import { FileUpload } from '../lib/FileUpload'; import _ from 'underscore'; diff --git a/app/file-upload/server/startup/settings.js b/app/file-upload/server/startup/settings.js index 506a8e6d7c6..d1462d9d9cc 100644 --- a/app/file-upload/server/startup/settings.js +++ b/app/file-upload/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('FileUpload', function() { this.add('FileUpload_Enabled', true, { diff --git a/app/github-enterprise/lib/common.js b/app/github-enterprise/lib/common.js index edfecc0717f..11d021b6f92 100644 --- a/app/github-enterprise/lib/common.js +++ b/app/github-enterprise/lib/common.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { CustomOAuth } from '/app/custom-oauth'; -import { settings } from '/app/settings'; +import { CustomOAuth } from '../../custom-oauth'; +import { settings } from '../../settings'; // GitHub Enterprise Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/github_enterprise // In RocketChat -> Administration the URL needs to be http(s)://{github.enterprise.server}/ diff --git a/app/github-enterprise/server/startup.js b/app/github-enterprise/server/startup.js index c6c3324370f..1a0b12514e9 100644 --- a/app/github-enterprise/server/startup.js +++ b/app/github-enterprise/server/startup.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('OAuth', function() { this.section('GitHub Enterprise', function() { diff --git a/app/gitlab/lib/common.js b/app/gitlab/lib/common.js index 61b88e178fe..b99a3b01f4d 100644 --- a/app/gitlab/lib/common.js +++ b/app/gitlab/lib/common.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { CustomOAuth } from '/app/custom-oauth'; +import { settings } from '../../settings'; +import { CustomOAuth } from '../../custom-oauth'; const config = { serverURL: 'https://gitlab.com', diff --git a/app/gitlab/server/startup.js b/app/gitlab/server/startup.js index 4d29a3d6583..ebf195d6e10 100644 --- a/app/gitlab/server/startup.js +++ b/app/gitlab/server/startup.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('OAuth', function() { this.section('GitLab', function() { diff --git a/app/google-vision/client/googlevision.js b/app/google-vision/client/googlevision.js index 13b73bbb6b9..cefb9f234ac 100644 --- a/app/google-vision/client/googlevision.js +++ b/app/google-vision/client/googlevision.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; const GoogleVision = { getVisionAttributes(attachment) { diff --git a/app/google-vision/server/googlevision.js b/app/google-vision/server/googlevision.js index edc268b619d..d59b87a4c8b 100644 --- a/app/google-vision/server/googlevision.js +++ b/app/google-vision/server/googlevision.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; -import { Uploads, Settings, Users, Messages } from '/app/models'; -import { FileUpload } from '/app/file-upload'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { Notifications } from '../../notifications'; +import { Uploads, Settings, Users, Messages } from '../../models'; +import { FileUpload } from '../../file-upload'; class GoogleVision { constructor() { diff --git a/app/google-vision/server/settings.js b/app/google-vision/server/settings.js index ae13150859d..a8639886b48 100644 --- a/app/google-vision/server/settings.js +++ b/app/google-vision/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.add('GoogleVision_Enable', false, { diff --git a/app/grant-facebook/server/index.js b/app/grant-facebook/server/index.js index a68f95b2469..b95e147134c 100644 --- a/app/grant-facebook/server/index.js +++ b/app/grant-facebook/server/index.js @@ -1,4 +1,4 @@ -import { Providers, GrantError } from '/app/grant'; +import { Providers, GrantError } from '../../grant'; import { HTTP } from 'meteor/http'; const userAgent = 'Meteor'; diff --git a/app/grant-github/server/index.js b/app/grant-github/server/index.js index 09404c6b57a..51b6428d457 100644 --- a/app/grant-github/server/index.js +++ b/app/grant-github/server/index.js @@ -1,4 +1,4 @@ -import { Providers, GrantError } from '/app/grant'; +import { Providers, GrantError } from '../../grant'; import { HTTP } from 'meteor/http'; const userAgent = 'Meteor'; diff --git a/app/grant-google/server/index.js b/app/grant-google/server/index.js index 2b7158f3d56..ef685eff355 100644 --- a/app/grant-google/server/index.js +++ b/app/grant-google/server/index.js @@ -1,4 +1,4 @@ -import { Providers, GrantError } from '/app/grant'; +import { Providers, GrantError } from '../../grant'; import { HTTP } from 'meteor/http'; const userAgent = 'Meteor'; diff --git a/app/grant/server/authenticate.js b/app/grant/server/authenticate.js index 9a449ef8a53..ccaef8f1822 100644 --- a/app/grant/server/authenticate.js +++ b/app/grant/server/authenticate.js @@ -1,10 +1,10 @@ -import { AccountsServer } from '/app/accounts'; -import { Users } from '/app/models'; +import { AccountsServer } from '../../accounts'; +import { Users } from '../../models'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import { GrantError } from './error'; import Providers from './providers'; -import { t } from '/app/utils'; +import { t } from '../../utils'; const setAvatarFromUrl = (userId, url) => new Promise((resolve, reject) => { Meteor.runAsUser(userId, () => { diff --git a/app/grant/server/grant.js b/app/grant/server/grant.js index b8e6a8841ea..191e547b76d 100644 --- a/app/grant/server/grant.js +++ b/app/grant/server/grant.js @@ -1,4 +1,4 @@ -import { hostname } from '/app/lib'; +import { hostname } from '../../lib'; import Providers from './providers'; import Settings from './settings'; import { path, generateCallback, generateAppCallback } from './routes'; diff --git a/app/graphql/server/api.js b/app/graphql/server/api.js index cb8723c2589..9da7e0e705e 100644 --- a/app/graphql/server/api.js +++ b/app/graphql/server/api.js @@ -4,7 +4,7 @@ import { SubscriptionServer } from 'subscriptions-transport-ws'; import { execute, subscribe } from 'graphql'; import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import bodyParser from 'body-parser'; import express from 'express'; import cors from 'cors'; diff --git a/app/graphql/server/helpers/authenticated.js b/app/graphql/server/helpers/authenticated.js index b2e9fdde9a7..4e542109459 100644 --- a/app/graphql/server/helpers/authenticated.js +++ b/app/graphql/server/helpers/authenticated.js @@ -1,4 +1,4 @@ -import { AccountsServer } from '/app/accounts'; +import { AccountsServer } from '../../../accounts'; // import { authenticated as _authenticated } from '@accounts/graphql-api'; import { authenticated as _authenticated } from '../mocks/accounts/graphql-api'; diff --git a/app/graphql/server/resolvers/accounts/index.js b/app/graphql/server/resolvers/accounts/index.js index cd2b0de1d5a..57b837ec61b 100644 --- a/app/graphql/server/resolvers/accounts/index.js +++ b/app/graphql/server/resolvers/accounts/index.js @@ -1,5 +1,5 @@ import { createJSAccountsGraphQL } from '@accounts/graphql-api'; -import { AccountsServer } from '/app/accounts'; +import { AccountsServer } from '../../../../accounts'; import { mergeTypes, mergeResolvers } from 'merge-graphql-schemas'; // queries diff --git a/app/graphql/server/resolvers/channels/Channel-type.js b/app/graphql/server/resolvers/channels/Channel-type.js index c61f5b14509..a0aab1087f2 100644 --- a/app/graphql/server/resolvers/channels/Channel-type.js +++ b/app/graphql/server/resolvers/channels/Channel-type.js @@ -1,4 +1,4 @@ -import { Subscriptions, Users } from '/app/models'; +import { Subscriptions, Users } from '../../../../models'; import property from 'lodash.property'; import schema from '../../schemas/channels/Channel-type.graphqls'; diff --git a/app/graphql/server/resolvers/channels/channelByName.js b/app/graphql/server/resolvers/channels/channelByName.js index 98724d4a9c8..14b70378b5e 100644 --- a/app/graphql/server/resolvers/channels/channelByName.js +++ b/app/graphql/server/resolvers/channels/channelByName.js @@ -1,4 +1,4 @@ -import { Rooms } from '/app/models'; +import { Rooms } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import { roomPublicFields } from './settings'; diff --git a/app/graphql/server/resolvers/channels/channels.js b/app/graphql/server/resolvers/channels/channels.js index cee86776ae2..80a357154ce 100644 --- a/app/graphql/server/resolvers/channels/channels.js +++ b/app/graphql/server/resolvers/channels/channels.js @@ -1,4 +1,4 @@ -import { Rooms } from '/app/models'; +import { Rooms } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import { roomPublicFields } from './settings'; diff --git a/app/graphql/server/resolvers/channels/channelsByUser.js b/app/graphql/server/resolvers/channels/channelsByUser.js index 879ed6c6633..51848b16082 100644 --- a/app/graphql/server/resolvers/channels/channelsByUser.js +++ b/app/graphql/server/resolvers/channels/channelsByUser.js @@ -1,4 +1,4 @@ -import { Users, Subscriptions, Rooms } from '/app/models'; +import { Users, Subscriptions, Rooms } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import { roomPublicFields } from './settings'; diff --git a/app/graphql/server/resolvers/channels/createChannel.js b/app/graphql/server/resolvers/channels/createChannel.js index 498d7c9d09e..3ef544bb199 100644 --- a/app/graphql/server/resolvers/channels/createChannel.js +++ b/app/graphql/server/resolvers/channels/createChannel.js @@ -1,4 +1,4 @@ -import { API } from '/app/api'; +import { API } from '../../../../api'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/channels/createChannel.graphqls'; diff --git a/app/graphql/server/resolvers/channels/deleteChannel.js b/app/graphql/server/resolvers/channels/deleteChannel.js index 333868edf46..8eeff88e88c 100644 --- a/app/graphql/server/resolvers/channels/deleteChannel.js +++ b/app/graphql/server/resolvers/channels/deleteChannel.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions } from '/app/models'; +import { Rooms, Subscriptions } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/channels/deleteChannel.graphqls'; diff --git a/app/graphql/server/resolvers/channels/directChannel.js b/app/graphql/server/resolvers/channels/directChannel.js index a2499fbb583..20ab63ec987 100644 --- a/app/graphql/server/resolvers/channels/directChannel.js +++ b/app/graphql/server/resolvers/channels/directChannel.js @@ -1,4 +1,4 @@ -import { Rooms } from '/app/models'; +import { Rooms } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import { roomPublicFields } from './settings'; diff --git a/app/graphql/server/resolvers/channels/hideChannel.js b/app/graphql/server/resolvers/channels/hideChannel.js index df50aea8113..12083caf47c 100644 --- a/app/graphql/server/resolvers/channels/hideChannel.js +++ b/app/graphql/server/resolvers/channels/hideChannel.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions } from '/app/models'; +import { Rooms, Subscriptions } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/channels/hideChannel.graphqls'; diff --git a/app/graphql/server/resolvers/channels/leaveChannel.js b/app/graphql/server/resolvers/channels/leaveChannel.js index 59e9e381555..0df7d8bf0eb 100644 --- a/app/graphql/server/resolvers/channels/leaveChannel.js +++ b/app/graphql/server/resolvers/channels/leaveChannel.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/channels/leaveChannel.graphqls'; diff --git a/app/graphql/server/resolvers/messages/Message-type.js b/app/graphql/server/resolvers/messages/Message-type.js index ea15c481153..7f83e8ff72f 100644 --- a/app/graphql/server/resolvers/messages/Message-type.js +++ b/app/graphql/server/resolvers/messages/Message-type.js @@ -1,4 +1,4 @@ -import { Rooms, Users } from '/app/models'; +import { Rooms, Users } from '../../../../models'; import property from 'lodash.property'; import { dateToFloat } from '../../helpers/dateToFloat'; diff --git a/app/graphql/server/resolvers/messages/addReactionToMessage.js b/app/graphql/server/resolvers/messages/addReactionToMessage.js index 78228e4af68..0960963d66a 100644 --- a/app/graphql/server/resolvers/messages/addReactionToMessage.js +++ b/app/graphql/server/resolvers/messages/addReactionToMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/messages/addReactionToMessage.graphqls'; diff --git a/app/graphql/server/resolvers/messages/chatMessageAdded.js b/app/graphql/server/resolvers/messages/chatMessageAdded.js index 1be975be7a7..e8b6ebe4e41 100644 --- a/app/graphql/server/resolvers/messages/chatMessageAdded.js +++ b/app/graphql/server/resolvers/messages/chatMessageAdded.js @@ -1,6 +1,6 @@ import { withFilter } from 'graphql-subscriptions'; -import { Rooms } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Rooms } from '../../../../models'; +import { callbacks } from '../../../../callbacks'; import { pubsub } from '../../subscriptions'; import { authenticated } from '../../helpers/authenticated'; diff --git a/app/graphql/server/resolvers/messages/deleteMessage.js b/app/graphql/server/resolvers/messages/deleteMessage.js index 01cb80eee7e..c91f5dc4ac2 100644 --- a/app/graphql/server/resolvers/messages/deleteMessage.js +++ b/app/graphql/server/resolvers/messages/deleteMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/messages/deleteMessage.graphqls'; diff --git a/app/graphql/server/resolvers/messages/editMessage.js b/app/graphql/server/resolvers/messages/editMessage.js index 6268bf1547d..818702bcd15 100644 --- a/app/graphql/server/resolvers/messages/editMessage.js +++ b/app/graphql/server/resolvers/messages/editMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/messages/editMessage.graphqls'; diff --git a/app/graphql/server/resolvers/messages/messages.js b/app/graphql/server/resolvers/messages/messages.js index f4591820858..03f6daee8bc 100644 --- a/app/graphql/server/resolvers/messages/messages.js +++ b/app/graphql/server/resolvers/messages/messages.js @@ -1,4 +1,4 @@ -import { Rooms, Messages } from '/app/models'; +import { Rooms, Messages } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/messages/messages.graphqls'; diff --git a/app/graphql/server/resolvers/messages/sendMessage.js b/app/graphql/server/resolvers/messages/sendMessage.js index df800ec70e0..2ed30c83c68 100644 --- a/app/graphql/server/resolvers/messages/sendMessage.js +++ b/app/graphql/server/resolvers/messages/sendMessage.js @@ -1,4 +1,4 @@ -import { processWebhookMessage } from '/app/lib'; +import { processWebhookMessage } from '../../../../lib'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/messages/sendMessage.graphqls'; diff --git a/app/graphql/server/resolvers/users/User-type.js b/app/graphql/server/resolvers/users/User-type.js index 02a75cbebfb..de33382d9cb 100644 --- a/app/graphql/server/resolvers/users/User-type.js +++ b/app/graphql/server/resolvers/users/User-type.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Avatars, Rooms } from '/app/models'; +import { Avatars, Rooms } from '../../../../models'; import property from 'lodash.property'; import schema from '../../schemas/users/User-type.graphqls'; diff --git a/app/graphql/server/resolvers/users/setStatus.js b/app/graphql/server/resolvers/users/setStatus.js index 8c8313e0121..e66ebf11ae1 100644 --- a/app/graphql/server/resolvers/users/setStatus.js +++ b/app/graphql/server/resolvers/users/setStatus.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../../models'; import { authenticated } from '../../helpers/authenticated'; import schema from '../../schemas/users/setStatus.graphqls'; diff --git a/app/graphql/server/settings.js b/app/graphql/server/settings.js index cb973486cc0..b1d0b7021b0 100644 --- a/app/graphql/server/settings.js +++ b/app/graphql/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('General', function() { this.section('GraphQL API', function() { diff --git a/app/highlight-words/client/client.js b/app/highlight-words/client/client.js index 30f66802c4b..a740542bf24 100644 --- a/app/highlight-words/client/client.js +++ b/app/highlight-words/client/client.js @@ -3,8 +3,8 @@ * @param {Object} message - The message object */ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { getUserPreference } from '/app/utils'; +import { callbacks } from '../../callbacks'; +import { getUserPreference } from '../../utils'; import _ from 'underscore'; import s from 'underscore.string'; import { highlightWords } from './helper'; diff --git a/app/iframe-login/client/iframe_client.js b/app/iframe-login/client/iframe_client.js index 886d3f66a02..48e72e251ec 100644 --- a/app/iframe-login/client/iframe_client.js +++ b/app/iframe-login/client/iframe_client.js @@ -1,5 +1,5 @@ import { Accounts } from 'meteor/accounts-base'; -import { IframeLogin } from '/app/ui-utils'; +import { IframeLogin } from '../../ui-utils'; import _ from 'underscore'; const iframeLogin = new IframeLogin(); diff --git a/app/iframe-login/server/iframe_rocketchat.js b/app/iframe-login/server/iframe_rocketchat.js index 552a2aa616e..794be76c18c 100644 --- a/app/iframe-login/server/iframe_rocketchat.js +++ b/app/iframe-login/server/iframe_rocketchat.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('Accounts', function() { diff --git a/app/importer-csv/client/adder.js b/app/importer-csv/client/adder.js index 17dd5d842b0..fc76e8ee2f0 100644 --- a/app/importer-csv/client/adder.js +++ b/app/importer-csv/client/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { CsvImporterInfo } from '../lib/info'; Importers.add(new CsvImporterInfo()); diff --git a/app/importer-csv/lib/info.js b/app/importer-csv/lib/info.js index 197cf106012..4b2db47aa71 100644 --- a/app/importer-csv/lib/info.js +++ b/app/importer-csv/lib/info.js @@ -1,4 +1,4 @@ -import { ImporterInfo } from '/app/importer'; +import { ImporterInfo } from '../../importer'; export class CsvImporterInfo extends ImporterInfo { constructor() { diff --git a/app/importer-csv/server/adder.js b/app/importer-csv/server/adder.js index 4055dd75843..b7254ecec1a 100644 --- a/app/importer-csv/server/adder.js +++ b/app/importer-csv/server/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { CsvImporterInfo } from '../lib/info'; import { CsvImporter } from './importer'; diff --git a/app/importer-csv/server/importer.js b/app/importer-csv/server/importer.js index f5802dca5a6..5ce60b61246 100644 --- a/app/importer-csv/server/importer.js +++ b/app/importer-csv/server/importer.js @@ -6,10 +6,10 @@ import { Selection, SelectionChannel, SelectionUser, -} from '/app/importer'; -import { RocketChatFile } from '/app/file'; -import { Users, Rooms } from '/app/models'; -import { sendMessage } from '/app/lib'; +} from '../../importer'; +import { RocketChatFile } from '../../file'; +import { Users, Rooms } from '../../models'; +import { sendMessage } from '../../lib'; export class CsvImporter extends Base { constructor(info) { diff --git a/app/importer-hipchat-enterprise/client/adder.js b/app/importer-hipchat-enterprise/client/adder.js index d707476f2a5..75dc9be3f8e 100644 --- a/app/importer-hipchat-enterprise/client/adder.js +++ b/app/importer-hipchat-enterprise/client/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { HipChatEnterpriseImporterInfo } from '../lib/info'; Importers.add(new HipChatEnterpriseImporterInfo()); diff --git a/app/importer-hipchat-enterprise/lib/info.js b/app/importer-hipchat-enterprise/lib/info.js index 3f792057b7a..48eb48b5560 100644 --- a/app/importer-hipchat-enterprise/lib/info.js +++ b/app/importer-hipchat-enterprise/lib/info.js @@ -1,4 +1,4 @@ -import { ImporterInfo } from '/app/importer'; +import { ImporterInfo } from '../../importer'; export class HipChatEnterpriseImporterInfo extends ImporterInfo { constructor() { diff --git a/app/importer-hipchat-enterprise/server/adder.js b/app/importer-hipchat-enterprise/server/adder.js index c5ac1022a47..dae738974b6 100644 --- a/app/importer-hipchat-enterprise/server/adder.js +++ b/app/importer-hipchat-enterprise/server/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { HipChatEnterpriseImporterInfo } from '../lib/info'; import { HipChatEnterpriseImporter } from './importer'; diff --git a/app/importer-hipchat-enterprise/server/importer.js b/app/importer-hipchat-enterprise/server/importer.js index 882bf448b41..eeaf9416336 100644 --- a/app/importer-hipchat-enterprise/server/importer.js +++ b/app/importer-hipchat-enterprise/server/importer.js @@ -9,9 +9,9 @@ import { SelectionChannel, SelectionUser, Imports, -} from '/app/importer'; -import { Messages, Users, Subscriptions, Rooms } from '/app/models'; -import { insertMessage } from '/app/lib'; +} from '../../importer'; +import { Messages, Users, Subscriptions, Rooms } from '../../models'; +import { insertMessage } from '../../lib'; import { Readable } from 'stream'; import path from 'path'; import fs from 'fs'; diff --git a/app/importer-hipchat/client/adder.js b/app/importer-hipchat/client/adder.js index 51349db038d..e50e073e687 100644 --- a/app/importer-hipchat/client/adder.js +++ b/app/importer-hipchat/client/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { HipChatImporterInfo } from '../lib/info'; Importers.add(new HipChatImporterInfo()); diff --git a/app/importer-hipchat/lib/info.js b/app/importer-hipchat/lib/info.js index f99f844ea3a..78982fc0b34 100644 --- a/app/importer-hipchat/lib/info.js +++ b/app/importer-hipchat/lib/info.js @@ -1,4 +1,4 @@ -import { ImporterInfo } from '/app/importer'; +import { ImporterInfo } from '../../importer'; export class HipChatImporterInfo extends ImporterInfo { constructor() { diff --git a/app/importer-hipchat/server/adder.js b/app/importer-hipchat/server/adder.js index a1a00e50eab..4b9457fa18b 100644 --- a/app/importer-hipchat/server/adder.js +++ b/app/importer-hipchat/server/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { HipChatImporterInfo } from '../lib/info'; import { HipChatImporter } from './importer'; diff --git a/app/importer-hipchat/server/importer.js b/app/importer-hipchat/server/importer.js index b352c8a716a..f4c260b3848 100644 --- a/app/importer-hipchat/server/importer.js +++ b/app/importer-hipchat/server/importer.js @@ -7,10 +7,10 @@ import { Selection, SelectionChannel, SelectionUser, -} from '/app/importer'; -import { RocketChatFile } from '/app/file'; -import { Users, Rooms } from '/app/models'; -import { sendMessage } from '/app/lib'; +} from '../../importer'; +import { RocketChatFile } from '../../file'; +import { Users, Rooms } from '../../models'; +import { sendMessage } from '../../lib'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/importer-slack-users/client/adder.js b/app/importer-slack-users/client/adder.js index 426f14aa09c..bac9b8d9628 100644 --- a/app/importer-slack-users/client/adder.js +++ b/app/importer-slack-users/client/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { SlackUsersImporterInfo } from '../lib/info'; Importers.add(new SlackUsersImporterInfo()); diff --git a/app/importer-slack-users/lib/info.js b/app/importer-slack-users/lib/info.js index b841d5ca3ab..d10067bc847 100644 --- a/app/importer-slack-users/lib/info.js +++ b/app/importer-slack-users/lib/info.js @@ -1,4 +1,4 @@ -import { ImporterInfo } from '/app/importer'; +import { ImporterInfo } from '../../importer'; export class SlackUsersImporterInfo extends ImporterInfo { constructor() { diff --git a/app/importer-slack-users/server/adder.js b/app/importer-slack-users/server/adder.js index 7f2fbce80f4..8381fd8c675 100644 --- a/app/importer-slack-users/server/adder.js +++ b/app/importer-slack-users/server/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { SlackUsersImporterInfo } from '../lib/info'; import { SlackUsersImporter } from './importer'; diff --git a/app/importer-slack-users/server/importer.js b/app/importer-slack-users/server/importer.js index b3ae4293cdb..bb58d4cf56a 100644 --- a/app/importer-slack-users/server/importer.js +++ b/app/importer-slack-users/server/importer.js @@ -6,9 +6,9 @@ import { ProgressStep, Selection, SelectionUser, -} from '/app/importer'; -import { RocketChatFile } from '/app/file'; -import { Users } from '/app/models'; +} from '../../importer'; +import { RocketChatFile } from '../../file'; +import { Users } from '../../models'; export class SlackUsersImporter extends Base { constructor(info) { diff --git a/app/importer-slack/client/adder.js b/app/importer-slack/client/adder.js index 6e53aa326da..12d6c3314db 100644 --- a/app/importer-slack/client/adder.js +++ b/app/importer-slack/client/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { SlackImporterInfo } from '../lib/info'; Importers.add(new SlackImporterInfo()); diff --git a/app/importer-slack/lib/info.js b/app/importer-slack/lib/info.js index d7090d60b1d..9d22d96cdaa 100644 --- a/app/importer-slack/lib/info.js +++ b/app/importer-slack/lib/info.js @@ -1,4 +1,4 @@ -import { ImporterInfo } from '/app/importer'; +import { ImporterInfo } from '../../importer'; export class SlackImporterInfo extends ImporterInfo { constructor() { diff --git a/app/importer-slack/server/adder.js b/app/importer-slack/server/adder.js index 053728acabe..d01df0c06fe 100644 --- a/app/importer-slack/server/adder.js +++ b/app/importer-slack/server/adder.js @@ -1,4 +1,4 @@ -import { Importers } from '/app/importer'; +import { Importers } from '../../importer'; import { SlackImporterInfo } from '../lib/info'; import { SlackImporter } from './importer'; diff --git a/app/importer-slack/server/importer.js b/app/importer-slack/server/importer.js index 00cbf3dbd5a..f09a32f4dde 100644 --- a/app/importer-slack/server/importer.js +++ b/app/importer-slack/server/importer.js @@ -6,11 +6,11 @@ import { Selection, SelectionChannel, SelectionUser, -} from '/app/importer'; -import { RocketChatFile } from '/app/file'; -import { getAvatarUrlFromUsername } from '/app/utils'; -import { Users, Rooms, Messages } from '/app/models'; -import { sendMessage } from '/app/lib'; +} from '../../importer'; +import { RocketChatFile } from '../../file'; +import { getAvatarUrlFromUsername } from '../../utils'; +import { Users, Rooms, Messages } from '../../models'; +import { sendMessage } from '../../lib'; import _ from 'underscore'; diff --git a/app/importer/client/ImporterWebsocketReceiver.js b/app/importer/client/ImporterWebsocketReceiver.js index 21ec542be31..1d834134c29 100644 --- a/app/importer/client/ImporterWebsocketReceiver.js +++ b/app/importer/client/ImporterWebsocketReceiver.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { CachedCollectionManager } from '../../ui-cached-collection'; class ImporterWebsocketReceiverDef { constructor() { diff --git a/app/importer/client/admin/adminImport.js b/app/importer/client/admin/adminImport.js index a5576a2a22a..e7bdca40530 100644 --- a/app/importer/client/admin/adminImport.js +++ b/app/importer/client/admin/adminImport.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; +import { Importers } from '../..'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasRole } from '/app/authorization'; -import { t, handleError } from '/app/utils'; +import { hasRole } from '../../../authorization'; +import { t, handleError } from '../../../utils'; Template.adminImport.helpers({ isAdmin() { diff --git a/app/importer/client/admin/adminImportHistory.js b/app/importer/client/admin/adminImportHistory.js index fb5884832b5..dc6d30ee308 100644 --- a/app/importer/client/admin/adminImportHistory.js +++ b/app/importer/client/admin/adminImportHistory.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; +import { Importers } from '../..'; import { Template } from 'meteor/templating'; -import { hasRole } from '/app/authorization'; -import { t, APIClient } from '/app/utils'; +import { hasRole } from '../../../authorization'; +import { t, APIClient } from '../../../utils'; import toastr from 'toastr'; import { ReactiveVar } from 'meteor/reactive-var'; import { ProgressStep } from '../../lib/ImporterProgressStep'; diff --git a/app/importer/client/admin/adminImportPrepare.js b/app/importer/client/admin/adminImportPrepare.js index 9d70ec2e354..ebe6be7e1f8 100644 --- a/app/importer/client/admin/adminImportPrepare.js +++ b/app/importer/client/admin/adminImportPrepare.js @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; -import { Importers } from '/app/importer'; +import { Importers } from '../..'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasRole } from '/app/authorization'; -import { settings } from '/app/settings'; -import { t, handleError, APIClient } from '/app/utils'; +import { hasRole } from '../../../authorization'; +import { settings } from '../../../settings'; +import { t, handleError, APIClient } from '../../../utils'; import toastr from 'toastr'; Template.adminImportPrepare.helpers({ diff --git a/app/importer/client/admin/adminImportProgress.js b/app/importer/client/admin/adminImportProgress.js index e5f277a3ae8..6dbf8068ca4 100644 --- a/app/importer/client/admin/adminImportProgress.js +++ b/app/importer/client/admin/adminImportProgress.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; -import { Importers, ImporterWebsocketReceiver, ProgressStep } from '/app/importer'; +import { Importers, ImporterWebsocketReceiver, ProgressStep } from '../..'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../utils'; import toastr from 'toastr'; Template.adminImportProgress.helpers({ diff --git a/app/importer/server/classes/ImporterBase.js b/app/importer/server/classes/ImporterBase.js index 8709849d060..603741f29be 100644 --- a/app/importer/server/classes/ImporterBase.js +++ b/app/importer/server/classes/ImporterBase.js @@ -6,10 +6,10 @@ import { Imports } from '../models/Imports'; import { ImporterInfo } from '../../lib/ImporterInfo'; import { RawImports } from '../models/RawImports'; import { ImporterWebsocket } from './ImporterWebsocket'; -import { Settings } from '/app/models'; -import { Logger } from '/app/logger'; -import { FileUpload } from '/app/file-upload'; -import { sendMessage } from '/app/lib'; +import { Settings } from '../../../models'; +import { Logger } from '../../../logger'; +import { FileUpload } from '../../../file-upload'; +import { sendMessage } from '../../../lib'; import http from 'http'; import fs from 'fs'; import https from 'https'; diff --git a/app/importer/server/methods/downloadPublicImportFile.js b/app/importer/server/methods/downloadPublicImportFile.js index bc35698ad27..97717167053 100644 --- a/app/importer/server/methods/downloadPublicImportFile.js +++ b/app/importer/server/methods/downloadPublicImportFile.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; +import { Importers } from '../..'; import { RocketChatImportFileInstance } from '../startup/store'; import { ProgressStep } from '../../lib/ImporterProgressStep'; -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../../authorization'; import http from 'http'; import fs from 'fs'; diff --git a/app/importer/server/methods/getImportFileData.js b/app/importer/server/methods/getImportFileData.js index a477027c638..d415de6c8f6 100644 --- a/app/importer/server/methods/getImportFileData.js +++ b/app/importer/server/methods/getImportFileData.js @@ -1,7 +1,7 @@ import { RocketChatImportFileInstance } from '../startup/store'; import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; -import { hasRole } from '/app/authorization'; +import { Importers } from '../..'; +import { hasRole } from '../../../authorization'; import { ProgressStep } from '../../lib/ImporterProgressStep'; import path from 'path'; import fs from 'fs'; diff --git a/app/importer/server/methods/getImportProgress.js b/app/importer/server/methods/getImportProgress.js index 298cf052b71..1ed256dd303 100644 --- a/app/importer/server/methods/getImportProgress.js +++ b/app/importer/server/methods/getImportProgress.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; -import { hasPermission } from '/app/authorization'; +import { Importers } from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ getImportProgress(key) { diff --git a/app/importer/server/methods/getLatestImportOperations.js b/app/importer/server/methods/getLatestImportOperations.js index d75e65af5ba..2d1a587dd70 100644 --- a/app/importer/server/methods/getLatestImportOperations.js +++ b/app/importer/server/methods/getLatestImportOperations.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Imports } from '../models/Imports'; -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../../authorization'; Meteor.methods({ getLatestImportOperations() { diff --git a/app/importer/server/methods/getSelectionData.js b/app/importer/server/methods/getSelectionData.js index 26f026b0d98..d091026e481 100644 --- a/app/importer/server/methods/getSelectionData.js +++ b/app/importer/server/methods/getSelectionData.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Importers, ProgressStep, -} from '/app/importer'; -import { hasPermission } from '/app/authorization'; +} from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ getSelectionData(key) { diff --git a/app/importer/server/methods/prepareImport.js b/app/importer/server/methods/prepareImport.js index aa72b59cf2d..b73ff46eeee 100644 --- a/app/importer/server/methods/prepareImport.js +++ b/app/importer/server/methods/prepareImport.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Importers } from '/app/importer'; -import { hasPermission } from '/app/authorization'; +import { Importers } from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ prepareImport(key, dataURI, contentType, fileName) { diff --git a/app/importer/server/methods/restartImport.js b/app/importer/server/methods/restartImport.js index 54cfcb4ee53..879d69212df 100644 --- a/app/importer/server/methods/restartImport.js +++ b/app/importer/server/methods/restartImport.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Importers, ProgressStep, -} from '/app/importer'; -import { hasPermission } from '/app/authorization'; +} from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ restartImport(key) { diff --git a/app/importer/server/methods/setupImporter.js b/app/importer/server/methods/setupImporter.js index 6fc3e4befa0..c9de108db6c 100644 --- a/app/importer/server/methods/setupImporter.js +++ b/app/importer/server/methods/setupImporter.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; -import { hasPermission } from '/app/authorization'; +import { Importers } from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ setupImporter(key) { diff --git a/app/importer/server/methods/startImport.js b/app/importer/server/methods/startImport.js index 66f84adb803..3ce1e4d2070 100644 --- a/app/importer/server/methods/startImport.js +++ b/app/importer/server/methods/startImport.js @@ -4,8 +4,8 @@ import { Selection, SelectionChannel, SelectionUser, -} from '/app/importer'; -import { hasPermission } from '/app/authorization'; +} from '../..'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ startImport(key, input) { diff --git a/app/importer/server/methods/uploadImportFile.js b/app/importer/server/methods/uploadImportFile.js index 9c1b90679eb..07147563d76 100644 --- a/app/importer/server/methods/uploadImportFile.js +++ b/app/importer/server/methods/uploadImportFile.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Importers } from '/app/importer'; -import { RocketChatFile } from '/app/file'; +import { Importers } from '../..'; +import { RocketChatFile } from '../../../file'; import { RocketChatImportFileInstance } from '../startup/store'; -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../../authorization'; Meteor.methods({ uploadImportFile(binaryContent, contentType, fileName, importerKey) { diff --git a/app/importer/server/models/Imports.js b/app/importer/server/models/Imports.js index d2850550859..585156e02ec 100644 --- a/app/importer/server/models/Imports.js +++ b/app/importer/server/models/Imports.js @@ -1,5 +1,5 @@ import { ProgressStep } from '../../lib/ImporterProgressStep'; -import { Base } from '/app/models'; +import { Base } from '../../../models'; class ImportsModel extends Base { constructor() { diff --git a/app/importer/server/models/RawImports.js b/app/importer/server/models/RawImports.js index 636c851acb1..168b73b3e07 100644 --- a/app/importer/server/models/RawImports.js +++ b/app/importer/server/models/RawImports.js @@ -1,4 +1,4 @@ -import { Base } from '/app/models'; +import { Base } from '../../../models'; class RawImportsModel extends Base { constructor() { diff --git a/app/importer/server/startup/store.js b/app/importer/server/startup/store.js index b498ac250fd..faaba0b8aac 100644 --- a/app/importer/server/startup/store.js +++ b/app/importer/server/startup/store.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { RocketChatFile } from '/app/file'; -import { settings } from '/app/settings'; +import { RocketChatFile } from '../../../file'; +import { settings } from '../../../settings'; export let RocketChatImportFileInstance; diff --git a/app/integrations/client/route.js b/app/integrations/client/route.js index e8f746940be..8d70059e94d 100644 --- a/app/integrations/client/route.js +++ b/app/integrations/client/route.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { t } from '/app/utils'; +import { t } from '../../utils'; FlowRouter.route('/admin/integrations', { name: 'admin-integrations', diff --git a/app/integrations/client/startup.js b/app/integrations/client/startup.js index eeeb33f5622..a481d5c5952 100644 --- a/app/integrations/client/startup.js +++ b/app/integrations/client/startup.js @@ -1,5 +1,5 @@ -import { AdminBox } from '/app/ui-utils'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { AdminBox } from '../../ui-utils'; +import { hasAtLeastOnePermission } from '../../authorization'; AdminBox.addOption({ href: 'admin-integrations', diff --git a/app/integrations/client/views/integrations.js b/app/integrations/client/views/integrations.js index 62136b1e57d..41591613793 100644 --- a/app/integrations/client/views/integrations.js +++ b/app/integrations/client/views/integrations.js @@ -1,6 +1,6 @@ import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { hasAtLeastOnePermission } from '../../../authorization'; import { integrations } from '../../lib/rocketchat'; import { ChatIntegrations } from '../collections'; import moment from 'moment'; diff --git a/app/integrations/client/views/integrationsIncoming.js b/app/integrations/client/views/integrationsIncoming.js index 5df578c48b9..97981117591 100644 --- a/app/integrations/client/views/integrationsIncoming.js +++ b/app/integrations/client/views/integrationsIncoming.js @@ -4,9 +4,9 @@ import { Random } from 'meteor/random'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasAtLeastOnePermission, hasAllPermission } from '/app/authorization'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { hasAtLeastOnePermission, hasAllPermission } from '../../../authorization'; +import { modal } from '../../../ui-utils'; +import { t, handleError } from '../../../utils'; import { ChatIntegrations } from '../collections'; import hljs from 'highlight.js'; import toastr from 'toastr'; diff --git a/app/integrations/client/views/integrationsNew.js b/app/integrations/client/views/integrationsNew.js index 389490ee957..844687b2bd1 100644 --- a/app/integrations/client/views/integrationsNew.js +++ b/app/integrations/client/views/integrationsNew.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { hasAtLeastOnePermission } from '../../../authorization'; Template.integrationsNew.helpers({ hasPermission() { diff --git a/app/integrations/client/views/integrationsOutgoing.js b/app/integrations/client/views/integrationsOutgoing.js index 074d8b2785b..6407d282d04 100644 --- a/app/integrations/client/views/integrationsOutgoing.js +++ b/app/integrations/client/views/integrationsOutgoing.js @@ -4,9 +4,9 @@ import { Random } from 'meteor/random'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasAllPermission, hasAtLeastOnePermission } from '/app/authorization'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization'; +import { modal } from '../../../ui-utils'; +import { t, handleError } from '../../../utils'; import { ChatIntegrations } from '../collections'; import { integrations } from '../../lib/rocketchat'; import hljs from 'highlight.js'; diff --git a/app/integrations/client/views/integrationsOutgoingHistory.js b/app/integrations/client/views/integrationsOutgoingHistory.js index 41f77d9e796..49272bcd433 100644 --- a/app/integrations/client/views/integrationsOutgoingHistory.js +++ b/app/integrations/client/views/integrationsOutgoingHistory.js @@ -3,8 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { handleError } from '/app/utils'; -import { hasAllPermission, hasAtLeastOnePermission } from '/app/authorization'; +import { handleError } from '../../../utils'; +import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization'; import { ChatIntegrations, ChatIntegrationHistory } from '../collections'; import { integrations } from '../../lib/rocketchat'; import _ from 'underscore'; diff --git a/app/integrations/server/api/api.js b/app/integrations/server/api/api.js index 29da213071a..9360669bc44 100644 --- a/app/integrations/server/api/api.js +++ b/app/integrations/server/api/api.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import { Random } from 'meteor/random'; -import * as Models from '/app/models'; +import * as Models from '../../../models'; import { Restivus } from 'meteor/nimble:restivus'; -import { API } from '/app/api'; +import { API } from '../../../api'; import { Livechat } from 'meteor/rocketchat:livechat'; -import { processWebhookMessage } from '/app/lib'; +import { processWebhookMessage } from '../../../lib'; import { logger } from '../logger'; import Fiber from 'fibers'; import Future from 'fibers/future'; diff --git a/app/integrations/server/lib/triggerHandler.js b/app/integrations/server/lib/triggerHandler.js index c85c566c7c8..297d0172ab9 100644 --- a/app/integrations/server/lib/triggerHandler.js +++ b/app/integrations/server/lib/triggerHandler.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { HTTP } from 'meteor/http'; -import * as Models from '/app/models'; -import { settings } from '/app/settings'; -import { getRoomByNameOrIdWithOptionToJoin, processWebhookMessage } from '/app/lib'; +import * as Models from '../../../models'; +import { settings } from '../../../settings'; +import { getRoomByNameOrIdWithOptionToJoin, processWebhookMessage } from '../../../lib'; import { logger } from '../logger'; import { integrations } from '../../lib/rocketchat'; import _ from 'underscore'; diff --git a/app/integrations/server/lib/validation.js b/app/integrations/server/lib/validation.js index 6b993b7ea31..4a0380366ef 100644 --- a/app/integrations/server/lib/validation.js +++ b/app/integrations/server/lib/validation.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Babel } from 'meteor/babel-compiler'; -import { Rooms, Users, Subscriptions } from '/app/models'; -import { hasPermission, hasAllPermission } from '/app/authorization'; +import { Rooms, Users, Subscriptions } from '../../../models'; +import { hasPermission, hasAllPermission } from '../../../authorization'; import { integrations } from '../../lib/rocketchat'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/integrations/server/logger.js b/app/integrations/server/logger.js index c23138f2e23..4a293574b98 100644 --- a/app/integrations/server/logger.js +++ b/app/integrations/server/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; export const logger = new Logger('Integrations', { sections: { diff --git a/app/integrations/server/methods/clearIntegrationHistory.js b/app/integrations/server/methods/clearIntegrationHistory.js index a510e3e3851..7e7e2a16e97 100644 --- a/app/integrations/server/methods/clearIntegrationHistory.js +++ b/app/integrations/server/methods/clearIntegrationHistory.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { IntegrationHistory, Integrations } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { IntegrationHistory, Integrations } from '../../../models'; Meteor.methods({ clearIntegrationHistory(integrationId) { diff --git a/app/integrations/server/methods/incoming/addIncomingIntegration.js b/app/integrations/server/methods/incoming/addIncomingIntegration.js index 63b62e0a5d4..92526bcdbac 100644 --- a/app/integrations/server/methods/incoming/addIncomingIntegration.js +++ b/app/integrations/server/methods/incoming/addIncomingIntegration.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { Babel } from 'meteor/babel-compiler'; -import { hasPermission, hasAllPermission } from '/app/authorization'; -import { Users, Rooms, Integrations, Roles, Subscriptions } from '/app/models'; +import { hasPermission, hasAllPermission } from '../../../../authorization'; +import { Users, Rooms, Integrations, Roles, Subscriptions } from '../../../../models'; import _ from 'underscore'; import s from 'underscore.string'; const validChannelChars = ['@', '#']; diff --git a/app/integrations/server/methods/incoming/deleteIncomingIntegration.js b/app/integrations/server/methods/incoming/deleteIncomingIntegration.js index ac48e67d8a5..f6f8618459a 100644 --- a/app/integrations/server/methods/incoming/deleteIncomingIntegration.js +++ b/app/integrations/server/methods/incoming/deleteIncomingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Integrations } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { Integrations } from '../../../../models'; Meteor.methods({ deleteIncomingIntegration(integrationId) { diff --git a/app/integrations/server/methods/incoming/updateIncomingIntegration.js b/app/integrations/server/methods/incoming/updateIncomingIntegration.js index 0e09c93eb5e..bb85c49c2bc 100644 --- a/app/integrations/server/methods/incoming/updateIncomingIntegration.js +++ b/app/integrations/server/methods/incoming/updateIncomingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasAllPermission, hasPermission } from '/app/authorization'; -import { Integrations, Rooms, Users, Roles, Subscriptions } from '/app/models'; +import { hasAllPermission, hasPermission } from '../../../../authorization'; +import { Integrations, Rooms, Users, Roles, Subscriptions } from '../../../../models'; import { Babel } from 'meteor/babel-compiler'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/integrations/server/methods/outgoing/addOutgoingIntegration.js b/app/integrations/server/methods/outgoing/addOutgoingIntegration.js index 621e4a9df62..d7294f55350 100644 --- a/app/integrations/server/methods/outgoing/addOutgoingIntegration.js +++ b/app/integrations/server/methods/outgoing/addOutgoingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users, Integrations } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { Users, Integrations } from '../../../../models'; import { integrations } from '../../../lib/rocketchat'; Meteor.methods({ diff --git a/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js b/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js index 8cac25c8bd3..098cea08113 100644 --- a/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js +++ b/app/integrations/server/methods/outgoing/deleteOutgoingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { IntegrationHistory, Integrations } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { IntegrationHistory, Integrations } from '../../../../models'; Meteor.methods({ deleteOutgoingIntegration(integrationId) { diff --git a/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js b/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js index 0bead3b1762..8efd460e977 100644 --- a/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js +++ b/app/integrations/server/methods/outgoing/replayOutgoingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Integrations, IntegrationHistory } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { Integrations, IntegrationHistory } from '../../../../models'; import { integrations } from '../../../lib/rocketchat'; Meteor.methods({ diff --git a/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js b/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js index 7ec0af45da9..bf63ff7debe 100644 --- a/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js +++ b/app/integrations/server/methods/outgoing/updateOutgoingIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Integrations, Users } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { Integrations, Users } from '../../../../models'; import { integrations } from '../../../lib/rocketchat'; Meteor.methods({ diff --git a/app/integrations/server/publications/integrationHistory.js b/app/integrations/server/publications/integrationHistory.js index 6b07c1c0633..1c9cca70669 100644 --- a/app/integrations/server/publications/integrationHistory.js +++ b/app/integrations/server/publications/integrationHistory.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { IntegrationHistory } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { IntegrationHistory } from '../../../models'; Meteor.publish('integrationHistory', function _integrationHistoryPublication(integrationId, limit = 25) { if (!this.userId) { diff --git a/app/integrations/server/publications/integrations.js b/app/integrations/server/publications/integrations.js index 7c7e0c30374..1ea723978b0 100644 --- a/app/integrations/server/publications/integrations.js +++ b/app/integrations/server/publications/integrations.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Integrations } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Integrations } from '../../../models'; Meteor.publish('integrations', function _integrationPublication() { if (!this.userId) { diff --git a/app/integrations/server/triggers.js b/app/integrations/server/triggers.js index 92fd31163e1..576e7f1801a 100644 --- a/app/integrations/server/triggers.js +++ b/app/integrations/server/triggers.js @@ -1,4 +1,4 @@ -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import { integrations } from '../lib/rocketchat'; const callbackHandler = function _callbackHandler(eventType) { diff --git a/app/irc/server/irc-bridge/index.js b/app/irc/server/irc-bridge/index.js index a358a119761..255d9946b70 100644 --- a/app/irc/server/irc-bridge/index.js +++ b/app/irc/server/irc-bridge/index.js @@ -1,4 +1,4 @@ -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../../callbacks'; import Queue from 'queue-fifo'; import * as servers from '../servers'; import * as peerCommandHandlers from './peerHandlers'; diff --git a/app/irc/server/irc-bridge/localHandlers/onCreateRoom.js b/app/irc/server/irc-bridge/localHandlers/onCreateRoom.js index 3215113d7f5..a336238a034 100644 --- a/app/irc/server/irc-bridge/localHandlers/onCreateRoom.js +++ b/app/irc/server/irc-bridge/localHandlers/onCreateRoom.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../../models'; export default function handleOnCreateRoom(user, room) { const users = Users.findByRoomId(room._id); diff --git a/app/irc/server/irc-bridge/localHandlers/onCreateUser.js b/app/irc/server/irc-bridge/localHandlers/onCreateUser.js index 9011d690e39..1549a703c9a 100644 --- a/app/irc/server/irc-bridge/localHandlers/onCreateUser.js +++ b/app/irc/server/irc-bridge/localHandlers/onCreateUser.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Rooms } from '/app/models'; +import { Users, Rooms } from '../../../../models'; export default function handleOnCreateUser(newUser) { if (!newUser) { diff --git a/app/irc/server/irc-bridge/localHandlers/onLogin.js b/app/irc/server/irc-bridge/localHandlers/onLogin.js index d50450f45b5..30af7c62d7e 100644 --- a/app/irc/server/irc-bridge/localHandlers/onLogin.js +++ b/app/irc/server/irc-bridge/localHandlers/onLogin.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Rooms } from '/app/models'; +import { Users, Rooms } from '../../../../models'; export default function handleOnLogin(login) { if (login.user === null) { diff --git a/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js b/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js index bfdba20eb57..88dc1b5301c 100644 --- a/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js +++ b/app/irc/server/irc-bridge/localHandlers/onSaveMessage.js @@ -1,4 +1,4 @@ -import { Subscriptions, Users } from '/app/models'; +import { Subscriptions, Users } from '../../../../models'; export default function handleOnSaveMessage(message, to) { let toIdentification = ''; diff --git a/app/irc/server/irc-bridge/peerHandlers/disconnected.js b/app/irc/server/irc-bridge/peerHandlers/disconnected.js index a3b208c5eec..0a30933857c 100644 --- a/app/irc/server/irc-bridge/peerHandlers/disconnected.js +++ b/app/irc/server/irc-bridge/peerHandlers/disconnected.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Rooms } from '/app/models'; +import { Users, Rooms } from '../../../../models'; export default function handleQUIT(args) { const user = Users.findOne({ diff --git a/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js b/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js index 5a2d1f459b1..29d3216071b 100644 --- a/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js +++ b/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js @@ -1,5 +1,5 @@ -import { Users, Rooms } from '/app/models'; -import { createRoom, addUserToRoom } from '/app/lib'; +import { Users, Rooms } from '../../../../models'; +import { createRoom, addUserToRoom } from '../../../../lib'; export default function handleJoinedChannel(args) { const user = Users.findOne({ diff --git a/app/irc/server/irc-bridge/peerHandlers/leftChannel.js b/app/irc/server/irc-bridge/peerHandlers/leftChannel.js index 685b171cb37..95445c65057 100644 --- a/app/irc/server/irc-bridge/peerHandlers/leftChannel.js +++ b/app/irc/server/irc-bridge/peerHandlers/leftChannel.js @@ -1,5 +1,5 @@ -import { Users, Rooms } from '/app/models'; -import { removeUserFromRoom } from '/app/lib'; +import { Users, Rooms } from '../../../../models'; +import { removeUserFromRoom } from '../../../../lib'; export default function handleLeftChannel(args) { const user = Users.findOne({ diff --git a/app/irc/server/irc-bridge/peerHandlers/nickChanged.js b/app/irc/server/irc-bridge/peerHandlers/nickChanged.js index 916c83e60bd..142a2883251 100644 --- a/app/irc/server/irc-bridge/peerHandlers/nickChanged.js +++ b/app/irc/server/irc-bridge/peerHandlers/nickChanged.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../../models'; export default function handleNickChanged(args) { const user = Users.findOne({ diff --git a/app/irc/server/irc-bridge/peerHandlers/sentMessage.js b/app/irc/server/irc-bridge/peerHandlers/sentMessage.js index 79685125b4f..347d1d128ed 100644 --- a/app/irc/server/irc-bridge/peerHandlers/sentMessage.js +++ b/app/irc/server/irc-bridge/peerHandlers/sentMessage.js @@ -1,5 +1,5 @@ -import { Users, Rooms, Subscriptions } from '/app/models'; -import { sendMessage } from '/app/lib'; +import { Users, Rooms, Subscriptions } from '../../../../models'; +import { sendMessage } from '../../../../lib'; /* * * Get direct chat room helper diff --git a/app/irc/server/irc-bridge/peerHandlers/userRegistered.js b/app/irc/server/irc-bridge/peerHandlers/userRegistered.js index e4a68cb5ba0..739f822e7da 100644 --- a/app/irc/server/irc-bridge/peerHandlers/userRegistered.js +++ b/app/irc/server/irc-bridge/peerHandlers/userRegistered.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../../models'; export default async function handleUserRegistered(args) { // Check if there is an user with the given username diff --git a/app/irc/server/irc-settings.js b/app/irc/server/irc-settings.js index fc1543ee68d..f82b2df2028 100644 --- a/app/irc/server/irc-settings.js +++ b/app/irc/server/irc-settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('IRC_Federation', function() { diff --git a/app/irc/server/irc.js b/app/irc/server/irc.js index 3e95e7ccdf8..92f2bbed835 100644 --- a/app/irc/server/irc.js +++ b/app/irc/server/irc.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import Bridge from './irc-bridge'; if (!!settings.get('IRC_Enabled') === true) { diff --git a/app/irc/server/methods/resetIrcConnection.js b/app/irc/server/methods/resetIrcConnection.js index 0cdcdb68d67..0abb366e0f6 100644 --- a/app/irc/server/methods/resetIrcConnection.js +++ b/app/irc/server/methods/resetIrcConnection.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { t } from '/app/utils'; +import { settings } from '../../../settings'; +import { t } from '../../../utils'; import Bridge from '../irc-bridge'; Meteor.methods({ diff --git a/app/issuelinks/client/client.js b/app/issuelinks/client/client.js index cc7128159cf..bf10fa9be64 100644 --- a/app/issuelinks/client/client.js +++ b/app/issuelinks/client/client.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import s from 'underscore.string'; // diff --git a/app/issuelinks/server/settings.js b/app/issuelinks/server/settings.js index 5b185e59f0c..94db4a32aa9 100644 --- a/app/issuelinks/server/settings.js +++ b/app/issuelinks/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.add('IssueLinks_Enabled', false, { type: 'boolean', diff --git a/app/katex/lib/katex.js b/app/katex/lib/katex.js index 9b799bffec1..4083fe92f38 100644 --- a/app/katex/lib/katex.js +++ b/app/katex/lib/katex.js @@ -1,6 +1,6 @@ import { Random } from 'meteor/random'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import _ from 'underscore'; import s from 'underscore.string'; import katex from 'katex'; diff --git a/app/katex/server/settings.js b/app/katex/server/settings.js index e4476a91afa..9700ced5578 100644 --- a/app/katex/server/settings.js +++ b/app/katex/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { const enableQuery = { diff --git a/app/ldap/server/ldap.js b/app/ldap/server/ldap.js index 9744fabe94a..0af7687477b 100644 --- a/app/ldap/server/ldap.js +++ b/app/ldap/server/ldap.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Logger } from '/app/logger'; +import { settings } from '../../settings'; +import { Logger } from '../../logger'; import ldapjs from 'ldapjs'; import Bunyan from 'bunyan'; diff --git a/app/ldap/server/loginHandler.js b/app/ldap/server/loginHandler.js index 3d2fce6dbfb..4e1ff7b5340 100644 --- a/app/ldap/server/loginHandler.js +++ b/app/ldap/server/loginHandler.js @@ -1,9 +1,9 @@ import { SHA256 } from 'meteor/sha'; import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Logger } from '/app/logger'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { Logger } from '../../logger'; import { slug, getLdapUsername, getLdapUserUniqueID, syncUserData, addLdapUser } from './sync'; import LDAP from './ldap'; diff --git a/app/ldap/server/settings.js b/app/ldap/server/settings.js index c4f9816825e..033c48caf73 100644 --- a/app/ldap/server/settings.js +++ b/app/ldap/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('LDAP', function() { const enableQuery = { _id: 'LDAP_Enable', value: true }; diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js index ed7932c89db..3b94bd9a43b 100644 --- a/app/ldap/server/sync.js +++ b/app/ldap/server/sync.js @@ -1,15 +1,15 @@ import limax from 'limax'; import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { RocketChatFile } from '/app/file'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { Users } from '/app/models'; -import { Logger } from '/app/logger'; -import { _setRealName, _setUsername } from '/app/lib'; -import { templateVarHandler } from '/app/utils'; +import { RocketChatFile } from '../../file'; +import { settings } from '../../settings'; +import { Notifications } from '../../notifications'; +import { Users } from '../../models'; +import { Logger } from '../../logger'; +import { _setRealName, _setUsername } from '../../lib'; +import { templateVarHandler } from '../../utils'; import { SyncedCron } from 'meteor/littledata:synced-cron'; -import { FileUpload } from '/app/file-upload'; +import { FileUpload } from '../../file-upload'; import _ from 'underscore'; import LDAP from './ldap'; diff --git a/app/ldap/server/syncUsers.js b/app/ldap/server/syncUsers.js index 9388b55dae3..ddfcae4d866 100644 --- a/app/ldap/server/syncUsers.js +++ b/app/ldap/server/syncUsers.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasRole } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasRole } from '../../authorization'; +import { settings } from '../../settings'; import { importNewUsers } from './sync'; Meteor.methods({ diff --git a/app/ldap/server/testConnection.js b/app/ldap/server/testConnection.js index d0fdeb1e425..5c5c30c763a 100644 --- a/app/ldap/server/testConnection.js +++ b/app/ldap/server/testConnection.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasRole } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasRole } from '../../authorization'; +import { settings } from '../../settings'; import LDAP from './ldap'; Meteor.methods({ diff --git a/app/lib/client/CustomTranslations.js b/app/lib/client/CustomTranslations.js index 2f1ab50cbe7..6c052a25ab5 100644 --- a/app/lib/client/CustomTranslations.js +++ b/app/lib/client/CustomTranslations.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; -import { applyCustomTranslations } from '/app/utils'; +import { applyCustomTranslations } from '../../utils'; import { Tracker } from 'meteor/tracker'; Meteor.startup(function() { diff --git a/app/lib/client/OAuthProxy.js b/app/lib/client/OAuthProxy.js index c8bf4b751a6..d99608f0375 100644 --- a/app/lib/client/OAuthProxy.js +++ b/app/lib/client/OAuthProxy.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { OAuth } from 'meteor/oauth'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; OAuth.launchLogin = _.wrap(OAuth.launchLogin, function(func, options) { const proxy = settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(','); diff --git a/app/lib/client/UserDeleted.js b/app/lib/client/UserDeleted.js index c7077624c84..3ba6d1c70ae 100644 --- a/app/lib/client/UserDeleted.js +++ b/app/lib/client/UserDeleted.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { ChatMessage } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { ChatMessage } from '../../models'; +import { Notifications } from '../../notifications'; Meteor.startup(function() { Notifications.onLogged('Users:Deleted', ({ userId }) => diff --git a/app/lib/client/defaultTabBars.js b/app/lib/client/defaultTabBars.js index 1448d24b71c..4093f772fa7 100644 --- a/app/lib/client/defaultTabBars.js +++ b/app/lib/client/defaultTabBars.js @@ -1,7 +1,7 @@ import { Session } from 'meteor/session'; -import { TabBar } from '/app/ui-utils'; -import { Rooms } from '/app/models'; -import { hasAllPermission } from '/app/authorization'; +import { TabBar } from '../../ui-utils'; +import { Rooms } from '../../models'; +import { hasAllPermission } from '../../authorization'; TabBar.addButton({ groups: ['channel', 'group', 'direct'], diff --git a/app/lib/client/lib/LoginPresence.js b/app/lib/client/lib/LoginPresence.js index 1061298d6c1..60a6549e914 100644 --- a/app/lib/client/lib/LoginPresence.js +++ b/app/lib/client/lib/LoginPresence.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export const LoginPresence = { awayTime: 600000, // 10 minutes diff --git a/app/lib/client/lib/formatDate.js b/app/lib/client/lib/formatDate.js index fcd2231b2e0..ec39f8d77c7 100644 --- a/app/lib/client/lib/formatDate.js +++ b/app/lib/client/lib/formatDate.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { getUserPreference } from '/app/utils'; -import { settings } from '/app/settings'; +import { getUserPreference } from '../../../utils'; +import { settings } from '../../../settings'; import moment from 'moment'; export const formatTime = (time) => { diff --git a/app/lib/client/lib/settings.js b/app/lib/client/lib/settings.js index 38cb6a34485..f3822e1e69a 100644 --- a/app/lib/client/lib/settings.js +++ b/app/lib/client/lib/settings.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { t } from '/app/utils'; -import { modal } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; +import { t } from '../../../utils'; +import { modal } from '../../../ui-utils'; +import { settings } from '../../../settings'; +import { hasRole } from '../../../authorization'; Meteor.startup(function() { Tracker.autorun(function(c) { diff --git a/app/lib/client/lib/startup/commands.js b/app/lib/client/lib/startup/commands.js index 2f34557ab2a..5fbcf3dbf20 100644 --- a/app/lib/client/lib/startup/commands.js +++ b/app/lib/client/lib/startup/commands.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { slashCommands, APIClient } from '/app/utils'; +import { slashCommands, APIClient } from '../../../../utils'; // Track logins and when they login, get the commands (() => { diff --git a/app/lib/client/lib/userRoles.js b/app/lib/client/lib/userRoles.js index 0bef27b2eb1..bd155ff88f3 100644 --- a/app/lib/client/lib/userRoles.js +++ b/app/lib/client/lib/userRoles.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { UserRoles, RoomRoles, ChatMessage } from '/app/models'; -import { handleError } from '/app/utils'; -import { Notifications } from '/app/notifications'; +import { UserRoles, RoomRoles, ChatMessage } from '../../../models'; +import { handleError } from '../../../utils'; +import { Notifications } from '../../../notifications'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/app/lib/client/methods/sendMessage.js b/app/lib/client/methods/sendMessage.js index 43b2485ed66..2003d2490ed 100644 --- a/app/lib/client/methods/sendMessage.js +++ b/app/lib/client/methods/sendMessage.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { TimeSync } from 'meteor/mizzao:timesync'; -import { ChatMessage } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { promises } from '/app/promises'; +import { ChatMessage } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { promises } from '../../../promises'; import s from 'underscore.string'; Meteor.methods({ diff --git a/app/lib/client/views/customFieldsForm.js b/app/lib/client/views/customFieldsForm.js index 666bd6822e2..103c6d73cca 100644 --- a/app/lib/client/views/customFieldsForm.js +++ b/app/lib/client/views/customFieldsForm.js @@ -1,7 +1,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.customFieldsForm.helpers({ new() { diff --git a/app/lib/lib/MessageTypes.js b/app/lib/lib/MessageTypes.js index 67d16be1d57..9967b313e7e 100644 --- a/app/lib/lib/MessageTypes.js +++ b/app/lib/lib/MessageTypes.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { MessageTypes } from '/app/ui-utils'; -import { callbacks } from '/app/callbacks'; +import { MessageTypes } from '../../ui-utils'; +import { callbacks } from '../../callbacks'; Meteor.startup(function() { MessageTypes.registerType({ diff --git a/app/lib/lib/roomTypes/conversation.js b/app/lib/lib/roomTypes/conversation.js index 042bb2317db..3c35787677f 100644 --- a/app/lib/lib/roomTypes/conversation.js +++ b/app/lib/lib/roomTypes/conversation.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { getUserPreference, RoomTypeConfig } from '/app/utils'; +import { getUserPreference, RoomTypeConfig } from '../../../utils'; export class ConversationRoomType extends RoomTypeConfig { constructor() { diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js index 60e9211086e..85e6486e8d6 100644 --- a/app/lib/lib/roomTypes/direct.js +++ b/app/lib/lib/roomTypes/direct.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { ChatRoom, Subscriptions } from '/app/models'; -import { openRoom } from '/app/ui-utils'; -import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '/app/utils'; -import { hasPermission, hasAtLeastOnePermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { ChatRoom, Subscriptions } from '../../../models'; +import { openRoom } from '../../../ui-utils'; +import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../../../utils'; +import { hasPermission, hasAtLeastOnePermission } from '../../../authorization'; +import { settings } from '../../../settings'; export class DirectMessageRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/app/lib/lib/roomTypes/favorite.js b/app/lib/lib/roomTypes/favorite.js index c4472aa04b5..8eea9b564d4 100644 --- a/app/lib/lib/roomTypes/favorite.js +++ b/app/lib/lib/roomTypes/favorite.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { getUserPreference, RoomTypeConfig } from '/app/utils'; +import { settings } from '../../../settings'; +import { getUserPreference, RoomTypeConfig } from '../../../utils'; export class FavoriteRoomType extends RoomTypeConfig { constructor() { diff --git a/app/lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js index 71d2d92ae46..728b1aebca1 100644 --- a/app/lib/lib/roomTypes/private.js +++ b/app/lib/lib/roomTypes/private.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { ChatRoom, ChatSubscription } from '/app/models'; -import { openRoom } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission, hasPermission } from '/app/authorization'; -import { getUserPreference, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from '/app/utils'; +import { ChatRoom, ChatSubscription } from '../../../models'; +import { openRoom } from '../../../ui-utils'; +import { settings } from '../../../settings'; +import { hasAtLeastOnePermission, hasPermission } from '../../../authorization'; +import { getUserPreference, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from '../../../utils'; export class PrivateRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/app/lib/lib/roomTypes/public.js b/app/lib/lib/roomTypes/public.js index 86cbc80db74..ba0f4d718df 100644 --- a/app/lib/lib/roomTypes/public.js +++ b/app/lib/lib/roomTypes/public.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { openRoom } from '/app/ui-utils'; -import { ChatRoom, ChatSubscription } from '/app/models'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '/app/utils'; +import { openRoom } from '../../../ui-utils'; +import { ChatRoom, ChatSubscription } from '../../../models'; +import { settings } from '../../../settings'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../../../utils'; export class PublicRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/app/lib/lib/roomTypes/unread.js b/app/lib/lib/roomTypes/unread.js index 38ccb664925..f4a81450f3c 100644 --- a/app/lib/lib/roomTypes/unread.js +++ b/app/lib/lib/roomTypes/unread.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { getUserPreference, RoomTypeConfig } from '/app/utils'; +import { getUserPreference, RoomTypeConfig } from '../../../utils'; export class UnreadRoomType extends RoomTypeConfig { constructor() { diff --git a/app/lib/lib/startup/settingsOnLoadSiteUrl.js b/app/lib/lib/startup/settingsOnLoadSiteUrl.js index 840ef9a1269..d398b6fca5c 100644 --- a/app/lib/lib/startup/settingsOnLoadSiteUrl.js +++ b/app/lib/lib/startup/settingsOnLoadSiteUrl.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { WebAppInternals } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export let hostname; diff --git a/app/lib/server/functions/addUserToDefaultChannels.js b/app/lib/server/functions/addUserToDefaultChannels.js index 76617c4af58..7777744be50 100644 --- a/app/lib/server/functions/addUserToDefaultChannels.js +++ b/app/lib/server/functions/addUserToDefaultChannels.js @@ -1,6 +1,6 @@ -import { Rooms, Subscriptions, Messages } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Subscriptions, Messages } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { callbacks } from '../../../callbacks'; export const addUserToDefaultChannels = function(user, silenced) { callbacks.run('beforeJoinDefaultChannels', user); diff --git a/app/lib/server/functions/addUserToRoom.js b/app/lib/server/functions/addUserToRoom.js index 3bcef5a2f68..d5147358a67 100644 --- a/app/lib/server/functions/addUserToRoom.js +++ b/app/lib/server/functions/addUserToRoom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions, Messages } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Subscriptions, Messages } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { callbacks } from '../../../callbacks'; export const addUserToRoom = function(rid, user, inviter, silenced) { const now = new Date(); diff --git a/app/lib/server/functions/archiveRoom.js b/app/lib/server/functions/archiveRoom.js index 15f906a27b8..c59702f7966 100644 --- a/app/lib/server/functions/archiveRoom.js +++ b/app/lib/server/functions/archiveRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Subscriptions } from '../../../models'; +import { callbacks } from '../../../callbacks'; export const archiveRoom = function(rid) { Rooms.archiveById(rid); diff --git a/app/lib/server/functions/attachMessage.js b/app/lib/server/functions/attachMessage.js index 8ee7c548b0f..f268f2bbfc9 100644 --- a/app/lib/server/functions/attachMessage.js +++ b/app/lib/server/functions/attachMessage.js @@ -1,6 +1,6 @@ -import { getAvatarUrlFromUsername } from '/app/utils'; -import { roomTypes } from '/app/utils'; +import { getAvatarUrlFromUsername } from '../../../utils'; +import { roomTypes } from '../../../utils'; export const attachMessage = function(message, room) { const { msg, u: { username }, ts, attachments, _id } = message; return { diff --git a/app/lib/server/functions/checkUsernameAvailability.js b/app/lib/server/functions/checkUsernameAvailability.js index 9ae568510c9..5ab313b0460 100644 --- a/app/lib/server/functions/checkUsernameAvailability.js +++ b/app/lib/server/functions/checkUsernameAvailability.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import s from 'underscore.string'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; let usernameBlackList = []; diff --git a/app/lib/server/functions/cleanRoomHistory.js b/app/lib/server/functions/cleanRoomHistory.js index f2167ab2462..0b01ae385e7 100644 --- a/app/lib/server/functions/cleanRoomHistory.js +++ b/app/lib/server/functions/cleanRoomHistory.js @@ -1,7 +1,7 @@ import { TAPi18n } from 'meteor/tap:i18n'; -import { FileUpload } from '/app/file-upload'; -import { Messages, Rooms } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { FileUpload } from '../../../file-upload'; +import { Messages, Rooms } from '../../../models'; +import { Notifications } from '../../../notifications'; import { deleteRoom } from './deleteRoom'; export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = new Date('0001-01-01T00:00:00Z'), inclusive = true, limit = 0, excludePinned = true, ignoreThreads = true, filesOnly = false, fromUsers = [] }) { diff --git a/app/lib/server/functions/createRoom.js b/app/lib/server/functions/createRoom.js index 608b4b93567..aec684123c7 100644 --- a/app/lib/server/functions/createRoom.js +++ b/app/lib/server/functions/createRoom.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Rooms, Subscriptions } from '/app/models'; -import { callbacks } from '/app/callbacks'; -import { hasPermission, addUserRoles } from '/app/authorization'; -import { getValidRoomName } from '/app/utils'; -import { Apps } from '/app/apps'; +import { Users, Rooms, Subscriptions } from '../../../models'; +import { callbacks } from '../../../callbacks'; +import { hasPermission, addUserRoles } from '../../../authorization'; +import { getValidRoomName } from '../../../utils'; +import { Apps } from '../../../apps'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/lib/server/functions/deleteMessage.js b/app/lib/server/functions/deleteMessage.js index f5516bba8eb..fd3582a3851 100644 --- a/app/lib/server/functions/deleteMessage.js +++ b/app/lib/server/functions/deleteMessage.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; -import { FileUpload } from '/app/file-upload'; -import { settings } from '/app/settings'; -import { Messages, Uploads, Rooms } from '/app/models'; -import { Notifications } from '/app/notifications'; -import { callbacks } from '/app/callbacks'; -import { Apps } from '/app/apps'; +import { FileUpload } from '../../../file-upload'; +import { settings } from '../../../settings'; +import { Messages, Uploads, Rooms } from '../../../models'; +import { Notifications } from '../../../notifications'; +import { callbacks } from '../../../callbacks'; +import { Apps } from '../../../apps'; export const deleteMessage = function(message, user) { const keepHistory = settings.get('Message_KeepHistory'); diff --git a/app/lib/server/functions/deleteRoom.js b/app/lib/server/functions/deleteRoom.js index 39dcc267ba3..e33c6ef3a2e 100644 --- a/app/lib/server/functions/deleteRoom.js +++ b/app/lib/server/functions/deleteRoom.js @@ -1,5 +1,5 @@ -import { Messages, Subscriptions, Rooms } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Messages, Subscriptions, Rooms } from '../../../models'; +import { callbacks } from '../../../callbacks'; export const deleteRoom = function(rid) { Messages.removeFilesByRoomId(rid); Messages.removeByRoomId(rid); diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js index 1e13ba719a9..a17f81731f8 100644 --- a/app/lib/server/functions/deleteUser.js +++ b/app/lib/server/functions/deleteUser.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { FileUpload } from '/app/file-upload'; -import { Users, Subscriptions, Messages, Rooms, Integrations } from '/app/models'; -import { hasRole, getUsersInRole } from '/app/authorization'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { FileUpload } from '../../../file-upload'; +import { Users, Subscriptions, Messages, Rooms, Integrations } from '../../../models'; +import { hasRole, getUsersInRole } from '../../../authorization'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; export const deleteUser = function(userId) { const user = Users.findOneById(userId, { diff --git a/app/lib/server/functions/getAvatarSuggestionForUser.js b/app/lib/server/functions/getAvatarSuggestionForUser.js index c2143695c50..ded58208519 100644 --- a/app/lib/server/functions/getAvatarSuggestionForUser.js +++ b/app/lib/server/functions/getAvatarSuggestionForUser.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { HTTP } from 'meteor/http'; import { Gravatar } from 'meteor/jparker:gravatar'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export function getAvatarSuggestionForUser(user) { check(user, Object); diff --git a/app/lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js index 16e01db83ee..14538b57eb4 100644 --- a/app/lib/server/functions/getFullUserData.js +++ b/app/lib/server/functions/getFullUserData.js @@ -1,8 +1,8 @@ import s from 'underscore.string'; -import { Logger } from '/app/logger'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Logger } from '../../../logger'; +import { settings } from '../../../settings'; +import { Users } from '../../../models'; +import { hasPermission } from '../../../authorization'; const logger = new Logger('getFullUserData'); diff --git a/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js b/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js index ec9d9deaafd..bae1f1cb3cf 100644 --- a/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js +++ b/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Users, Subscriptions } from '/app/models'; +import { Rooms, Users, Subscriptions } from '../../../models'; import _ from 'underscore'; export const getRoomByNameOrIdWithOptionToJoin = function _getRoomByNameOrIdWithOptionToJoin({ currentUserId, nameOrId, type = '', tryDirectByUserIdOnly = false, joinChannel = true, errorOnEmpty = true }) { diff --git a/app/lib/server/functions/getUsernameSuggestion.js b/app/lib/server/functions/getUsernameSuggestion.js index f3f0075c4c2..b0752cf0dec 100644 --- a/app/lib/server/functions/getUsernameSuggestion.js +++ b/app/lib/server/functions/getUsernameSuggestion.js @@ -1,7 +1,7 @@ import limax from 'limax'; import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Users } from '../../../models'; +import { settings } from '../../../settings'; function slug(text) { return limax(text, { replacement: '.' }).replace(/[^0-9a-z-_.]/g, ''); diff --git a/app/lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js index c30de6bcd66..55aa18a2f1f 100644 --- a/app/lib/server/functions/insertMessage.js +++ b/app/lib/server/functions/insertMessage.js @@ -1,6 +1,6 @@ import { Match, check } from 'meteor/check'; -import { Markdown } from '/app/markdown'; -import { Messages } from '/app/models'; +import { Markdown } from '../../../markdown'; +import { Messages } from '../../../models'; const objectMaybeIncluding = (types) => Match.Where((value) => { Object.keys(types).forEach((field) => { diff --git a/app/lib/server/functions/isTheLastMessage.js b/app/lib/server/functions/isTheLastMessage.js index 2be4ed33f4e..c1642b992ce 100644 --- a/app/lib/server/functions/isTheLastMessage.js +++ b/app/lib/server/functions/isTheLastMessage.js @@ -1,3 +1,3 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export const isTheLastMessage = (room, message) => settings.get('Store_Last_Message') && (!room.lastMessage || room.lastMessage._id === message._id); diff --git a/app/lib/server/functions/loadMessageHistory.js b/app/lib/server/functions/loadMessageHistory.js index 0522f999c76..6f32ad06c65 100644 --- a/app/lib/server/functions/loadMessageHistory.js +++ b/app/lib/server/functions/loadMessageHistory.js @@ -1,6 +1,6 @@ -import { settings } from '/app/settings'; -import { Messages } from '/app/models'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { settings } from '../../../settings'; +import { Messages } from '../../../models'; +import { composeMessageObjectWithUser } from '../../../utils'; const hideMessagesOfType = []; diff --git a/app/lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js index a89b9bce674..b52f0f2f78b 100644 --- a/app/lib/server/functions/notifications/audio.js +++ b/app/lib/server/functions/notifications/audio.js @@ -1,6 +1,6 @@ -import { metrics } from '/app/metrics'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { metrics } from '../../../../metrics'; +import { settings } from '../../../../settings'; +import { Notifications } from '../../../../notifications'; export function shouldNotifyAudio({ disableAllMessageNotifications, diff --git a/app/lib/server/functions/notifications/desktop.js b/app/lib/server/functions/notifications/desktop.js index b619b6af42c..d4aefee34b4 100644 --- a/app/lib/server/functions/notifications/desktop.js +++ b/app/lib/server/functions/notifications/desktop.js @@ -1,7 +1,7 @@ -import { metrics } from '/app/metrics'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { roomTypes } from '/app/utils'; +import { metrics } from '../../../../metrics'; +import { settings } from '../../../../settings'; +import { Notifications } from '../../../../notifications'; +import { roomTypes } from '../../../../utils'; /** * Send notification to user * diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js index 97afa8b94db..181bb42cbf9 100644 --- a/app/lib/server/functions/notifications/email.js +++ b/app/lib/server/functions/notifications/email.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; -import { settings } from '/app/settings'; -import { roomTypes } from '/app/utils'; -import { metrics } from '/app/metrics'; -import { callbacks } from '/app/callbacks'; +import * as Mailer from '../../../../mailer'; +import { settings } from '../../../../settings'; +import { roomTypes } from '../../../../utils'; +import { metrics } from '../../../../metrics'; +import { callbacks } from '../../../../callbacks'; let advice = ''; let goToMessage = ''; diff --git a/app/lib/server/functions/notifications/index.js b/app/lib/server/functions/notifications/index.js index bf85a563b21..3627a294844 100644 --- a/app/lib/server/functions/notifications/index.js +++ b/app/lib/server/functions/notifications/index.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import s from 'underscore.string'; /** diff --git a/app/lib/server/functions/notifications/mobile.js b/app/lib/server/functions/notifications/mobile.js index 921f090c4c2..d29a28519a4 100644 --- a/app/lib/server/functions/notifications/mobile.js +++ b/app/lib/server/functions/notifications/mobile.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Subscriptions } from '/app/models'; -import { roomTypes } from '/app/utils'; -import { PushNotification } from '/app/push-notifications'; +import { settings } from '../../../../settings'; +import { Subscriptions } from '../../../../models'; +import { roomTypes } from '../../../../utils'; +import { PushNotification } from '../../../../push-notifications'; const CATEGORY_MESSAGE = 'MESSAGE'; const CATEGORY_MESSAGE_NOREPLY = 'MESSAGE_NOREPLY'; diff --git a/app/lib/server/functions/processWebhookMessage.js b/app/lib/server/functions/processWebhookMessage.js index 79631104b0e..d08a744133f 100644 --- a/app/lib/server/functions/processWebhookMessage.js +++ b/app/lib/server/functions/processWebhookMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; import { getRoomByNameOrIdWithOptionToJoin } from './getRoomByNameOrIdWithOptionToJoin'; import { sendMessage } from './sendMessage'; import _ from 'underscore'; diff --git a/app/lib/server/functions/removeUserFromRoom.js b/app/lib/server/functions/removeUserFromRoom.js index 27a1818692e..1baec02eb7d 100644 --- a/app/lib/server/functions/removeUserFromRoom.js +++ b/app/lib/server/functions/removeUserFromRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Messages, Subscriptions } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Messages, Subscriptions } from '../../../models'; +import { callbacks } from '../../../callbacks'; export const removeUserFromRoom = function(rid, user, options = {}) { const room = Rooms.findOneById(rid); diff --git a/app/lib/server/functions/saveCustomFields.js b/app/lib/server/functions/saveCustomFields.js index cab368e4877..90a700d7ae4 100644 --- a/app/lib/server/functions/saveCustomFields.js +++ b/app/lib/server/functions/saveCustomFields.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { validateCustomFields, saveCustomFieldsWithoutValidation } from '.'; import s from 'underscore.string'; diff --git a/app/lib/server/functions/saveCustomFieldsWithoutValidation.js b/app/lib/server/functions/saveCustomFieldsWithoutValidation.js index 0ae818d14db..9b5149834a3 100644 --- a/app/lib/server/functions/saveCustomFieldsWithoutValidation.js +++ b/app/lib/server/functions/saveCustomFieldsWithoutValidation.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Users, Subscriptions } from '/app/models'; +import { settings } from '../../../settings'; +import { Users, Subscriptions } from '../../../models'; import s from 'underscore.string'; export const saveCustomFieldsWithoutValidation = function(userId, formData) { diff --git a/app/lib/server/functions/saveUser.js b/app/lib/server/functions/saveUser.js index 70ccaaaf748..5efd2d5465b 100644 --- a/app/lib/server/functions/saveUser.js +++ b/app/lib/server/functions/saveUser.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import _ from 'underscore'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; +import * as Mailer from '../../../mailer'; import { Gravatar } from 'meteor/jparker:gravatar'; -import { getRoles, hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { getRoles, hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; import PasswordPolicy from '../lib/PasswordPolicyClass'; import { checkEmailAvailability, checkUsernameAvailability, setUserAvatar, setEmail, setRealName, setUsername } from '.'; import { validateEmailDomain } from '../lib'; diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js index 0cecbecdc59..ea14d9aef07 100644 --- a/app/lib/server/functions/sendMessage.js +++ b/app/lib/server/functions/sendMessage.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Messages } from '/app/models'; -import { Apps } from '/app/apps'; -import { Markdown } from '/app/markdown'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { Messages } from '../../../models'; +import { Apps } from '../../../apps'; +import { Markdown } from '../../../markdown'; const objectMaybeIncluding = (types) => Match.Where((value) => { Object.keys(types).forEach((field) => { diff --git a/app/lib/server/functions/setEmail.js b/app/lib/server/functions/setEmail.js index 5ebf3e7a175..5bdf8b4b2c0 100644 --- a/app/lib/server/functions/setEmail.js +++ b/app/lib/server/functions/setEmail.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Users } from '../../../models'; +import { hasPermission } from '../../../authorization'; import { RateLimiter, validateEmailDomain } from '../lib'; import { checkEmailAvailability } from '.'; import s from 'underscore.string'; diff --git a/app/lib/server/functions/setRealName.js b/app/lib/server/functions/setRealName.js index 6eabf1cbc51..6a14f17f62f 100644 --- a/app/lib/server/functions/setRealName.js +++ b/app/lib/server/functions/setRealName.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { hasPermission } from '/app/authorization'; +import { Users, Subscriptions } from '../../../models'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; +import { hasPermission } from '../../../authorization'; import { RateLimiter } from '../lib'; import s from 'underscore.string'; diff --git a/app/lib/server/functions/setUserAvatar.js b/app/lib/server/functions/setUserAvatar.js index 35a729a8c65..1f3ed06702d 100644 --- a/app/lib/server/functions/setUserAvatar.js +++ b/app/lib/server/functions/setUserAvatar.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { RocketChatFile } from '/app/file'; -import { FileUpload } from '/app/file-upload'; -import { Users } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { RocketChatFile } from '../../../file'; +import { FileUpload } from '../../../file-upload'; +import { Users } from '../../../models'; +import { Notifications } from '../../../notifications'; export const setUserAvatar = function(user, dataURI, contentType, service) { let encoding; diff --git a/app/lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js index f3a7d047b8e..9e8a5502359 100644 --- a/app/lib/server/functions/setUsername.js +++ b/app/lib/server/functions/setUsername.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import s from 'underscore.string'; import { Accounts } from 'meteor/accounts-base'; -import { FileUpload } from '/app/file-upload'; -import { settings } from '/app/settings'; -import { Users, Messages, Subscriptions, Rooms, LivechatDepartmentAgents } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { FileUpload } from '../../../file-upload'; +import { settings } from '../../../settings'; +import { Users, Messages, Subscriptions, Rooms, LivechatDepartmentAgents } from '../../../models'; +import { hasPermission } from '../../../authorization'; import { RateLimiter } from '../lib'; import { checkUsernameAvailability, setUserAvatar, getAvatarSuggestionForUser } from '.'; diff --git a/app/lib/server/functions/unarchiveRoom.js b/app/lib/server/functions/unarchiveRoom.js index bc4aaf8f1fa..86cd66640bd 100644 --- a/app/lib/server/functions/unarchiveRoom.js +++ b/app/lib/server/functions/unarchiveRoom.js @@ -1,4 +1,4 @@ -import { Rooms, Subscriptions } from '/app/models'; +import { Rooms, Subscriptions } from '../../../models'; export const unarchiveRoom = function(rid) { Rooms.unarchiveById(rid); diff --git a/app/lib/server/functions/updateMessage.js b/app/lib/server/functions/updateMessage.js index f75b48b4d59..d81e3be394b 100644 --- a/app/lib/server/functions/updateMessage.js +++ b/app/lib/server/functions/updateMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Apps } from '/app/apps'; +import { Messages, Rooms } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { Apps } from '../../../apps'; export const updateMessage = function(message, user, originalMessage) { if (!originalMessage) { diff --git a/app/lib/server/functions/validateCustomFields.js b/app/lib/server/functions/validateCustomFields.js index c223a3146f1..1e9da50f016 100644 --- a/app/lib/server/functions/validateCustomFields.js +++ b/app/lib/server/functions/validateCustomFields.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import s from 'underscore.string'; export const validateCustomFields = function(fields) { diff --git a/app/lib/server/lib/bugsnag.js b/app/lib/server/lib/bugsnag.js index 376b8dd013a..b734817afe6 100644 --- a/app/lib/server/lib/bugsnag.js +++ b/app/lib/server/lib/bugsnag.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Info } from '/app/utils'; +import { settings } from '../../../settings'; +import { Info } from '../../../utils'; import bugsnag from 'bugsnag'; settings.get('Bugsnag_api_key', (key, value) => { diff --git a/app/lib/server/lib/configLogger.js b/app/lib/server/lib/configLogger.js index 0a68a9aa76f..b4bb239c7b6 100644 --- a/app/lib/server/lib/configLogger.js +++ b/app/lib/server/lib/configLogger.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { LoggerManager } from '/app/logger'; -import { settings } from '/app/settings'; +import { LoggerManager } from '../../../logger'; +import { settings } from '../../../settings'; settings.get('Log_Package', function(key, value) { return LoggerManager.showPackage = value; diff --git a/app/lib/server/lib/debug.js b/app/lib/server/lib/debug.js index e42ed5e73ed..d7c4e5c5bff 100644 --- a/app/lib/server/lib/debug.js +++ b/app/lib/server/lib/debug.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; -import { settings } from '/app/settings'; -import { metrics } from '/app/metrics'; +import { settings } from '../../../settings'; +import { metrics } from '../../../metrics'; import _ from 'underscore'; -import { Logger } from '/app/logger'; +import { Logger } from '../../../logger'; const logger = new Logger('Meteor', { methods: { diff --git a/app/lib/server/lib/interceptDirectReplyEmails.js b/app/lib/server/lib/interceptDirectReplyEmails.js index 5f17511cd86..1845bbcf73f 100644 --- a/app/lib/server/lib/interceptDirectReplyEmails.js +++ b/app/lib/server/lib/interceptDirectReplyEmails.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import IMAP from 'imap'; import POP3Lib from 'poplib'; import { simpleParser } from 'mailparser'; diff --git a/app/lib/server/lib/notifyUsersOnMessage.js b/app/lib/server/lib/notifyUsersOnMessage.js index fad56017c8c..1b857853266 100644 --- a/app/lib/server/lib/notifyUsersOnMessage.js +++ b/app/lib/server/lib/notifyUsersOnMessage.js @@ -1,9 +1,9 @@ import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; -import { Rooms, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Subscriptions } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; /** * Chechs if a messages contains a user highlight diff --git a/app/lib/server/lib/passwordPolicy.js b/app/lib/server/lib/passwordPolicy.js index f9ef37c618d..a190e8cb5d3 100644 --- a/app/lib/server/lib/passwordPolicy.js +++ b/app/lib/server/lib/passwordPolicy.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import PasswordPolicy from './PasswordPolicyClass'; export const passwordPolicy = new PasswordPolicy(); diff --git a/app/lib/server/lib/processDirectEmail.js b/app/lib/server/lib/processDirectEmail.js index dccbc4d9c4e..fa751e32aee 100644 --- a/app/lib/server/lib/processDirectEmail.js +++ b/app/lib/server/lib/processDirectEmail.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Rooms, Messages, Users, Subscriptions } from '/app/models'; -import { metrics } from '/app/metrics'; +import { settings } from '../../../settings'; +import { Rooms, Messages, Users, Subscriptions } from '../../../models'; +import { metrics } from '../../../metrics'; import { EmailReplyParser as reply } from 'emailreplyparser'; import { sendMessage as _sendMessage } from '../functions'; import moment from 'moment'; diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js index 579baebd756..482b02c829b 100644 --- a/app/lib/server/lib/sendNotificationsOnMessage.js +++ b/app/lib/server/lib/sendNotificationsOnMessage.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import moment from 'moment'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Subscriptions } from '/app/models'; -import { roomTypes } from '/app/utils'; -import { Sandstorm } from '/app/sandstorm'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { Subscriptions } from '../../../models'; +import { roomTypes } from '../../../utils'; +import { Sandstorm } from '../../../sandstorm'; import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications/'; import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email'; import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile'; diff --git a/app/lib/server/lib/validateEmailDomain.js b/app/lib/server/lib/validateEmailDomain.js index 6a0c1f4dc2a..cce61e2f642 100644 --- a/app/lib/server/lib/validateEmailDomain.js +++ b/app/lib/server/lib/validateEmailDomain.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { emailDomainDefaultBlackList } from './defaultBlockedDomainsList'; import _ from 'underscore'; import dns from 'dns'; diff --git a/app/lib/server/methods/addOAuthService.js b/app/lib/server/methods/addOAuthService.js index 72b31aa3e91..171e01ab1a4 100644 --- a/app/lib/server/methods/addOAuthService.js +++ b/app/lib/server/methods/addOAuthService.js @@ -2,8 +2,8 @@ /* eslint comma-spacing: 0 */ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; +import { settings } from '../../../settings'; +import { hasPermission } from '../../../authorization'; import s from 'underscore.string'; Meteor.methods({ diff --git a/app/lib/server/methods/addUsersToRoom.js b/app/lib/server/methods/addUsersToRoom.js index aea91c4f8ab..d2ac1958cd0 100644 --- a/app/lib/server/methods/addUsersToRoom.js +++ b/app/lib/server/methods/addUsersToRoom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms, Subscriptions, Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Rooms, Subscriptions, Users } from '../../../models'; +import { hasPermission } from '../../../authorization'; import { addUserToRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/archiveRoom.js b/app/lib/server/methods/archiveRoom.js index e4c8f712d2b..fc939a11000 100644 --- a/app/lib/server/methods/archiveRoom.js +++ b/app/lib/server/methods/archiveRoom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Rooms } from '../../../models'; +import { hasPermission } from '../../../authorization'; import { archiveRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/blockUser.js b/app/lib/server/methods/blockUser.js index a3ccc17a49d..102bbaead7c 100644 --- a/app/lib/server/methods/blockUser.js +++ b/app/lib/server/methods/blockUser.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; Meteor.methods({ blockUser({ rid, blocked }) { diff --git a/app/lib/server/methods/checkRegistrationSecretURL.js b/app/lib/server/methods/checkRegistrationSecretURL.js index 38a4d721c63..1c142a4672a 100644 --- a/app/lib/server/methods/checkRegistrationSecretURL.js +++ b/app/lib/server/methods/checkRegistrationSecretURL.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Meteor.methods({ checkRegistrationSecretURL(hash) { diff --git a/app/lib/server/methods/checkUsernameAvailability.js b/app/lib/server/methods/checkUsernameAvailability.js index 404d00315f8..994d71a3abc 100644 --- a/app/lib/server/methods/checkUsernameAvailability.js +++ b/app/lib/server/methods/checkUsernameAvailability.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { checkUsernameAvailability } from '../functions'; import { RateLimiter } from '../lib'; diff --git a/app/lib/server/methods/cleanRoomHistory.js b/app/lib/server/methods/cleanRoomHistory.js index f406abb3f58..82f95895db0 100644 --- a/app/lib/server/methods/cleanRoomHistory.js +++ b/app/lib/server/methods/cleanRoomHistory.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { cleanRoomHistory } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/createChannel.js b/app/lib/server/methods/createChannel.js index af8b32561ed..53d442b2f55 100644 --- a/app/lib/server/methods/createChannel.js +++ b/app/lib/server/methods/createChannel.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { createRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/createPrivateGroup.js b/app/lib/server/methods/createPrivateGroup.js index 6bb3aa45b34..f99f8e8c360 100644 --- a/app/lib/server/methods/createPrivateGroup.js +++ b/app/lib/server/methods/createPrivateGroup.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { createRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/createToken.js b/app/lib/server/methods/createToken.js index a9cbc206b12..881f2055a2a 100644 --- a/app/lib/server/methods/createToken.js +++ b/app/lib/server/methods/createToken.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ createToken(userId) { diff --git a/app/lib/server/methods/deleteMessage.js b/app/lib/server/methods/deleteMessage.js index 89ad98ce6b2..28d0149e168 100644 --- a/app/lib/server/methods/deleteMessage.js +++ b/app/lib/server/methods/deleteMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { Messages } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; +import { Messages } from '../../../models'; import { deleteMessage } from '../functions'; import moment from 'moment'; diff --git a/app/lib/server/methods/deleteUserOwnAccount.js b/app/lib/server/methods/deleteUserOwnAccount.js index 6010de3bb5c..b6d5692042d 100644 --- a/app/lib/server/methods/deleteUserOwnAccount.js +++ b/app/lib/server/methods/deleteUserOwnAccount.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; +import { settings } from '../../../settings'; +import { Users } from '../../../models'; import { deleteUser } from '../functions'; import s from 'underscore.string'; diff --git a/app/lib/server/methods/executeSlashCommandPreview.js b/app/lib/server/methods/executeSlashCommandPreview.js index 80043109679..7baaad79fdd 100644 --- a/app/lib/server/methods/executeSlashCommandPreview.js +++ b/app/lib/server/methods/executeSlashCommandPreview.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../../utils'; Meteor.methods({ executeSlashCommandPreview(command, preview) { diff --git a/app/lib/server/methods/filterATAllTag.js b/app/lib/server/methods/filterATAllTag.js index 4ccf8b53360..c1721cb54e5 100644 --- a/app/lib/server/methods/filterATAllTag.js +++ b/app/lib/server/methods/filterATAllTag.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasPermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { callbacks } from '../../../callbacks'; +import { Notifications } from '../../../notifications'; +import { Users } from '../../../models'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/lib/server/methods/filterATHereTag.js b/app/lib/server/methods/filterATHereTag.js index 474298eceb9..9b917bc8b08 100644 --- a/app/lib/server/methods/filterATHereTag.js +++ b/app/lib/server/methods/filterATHereTag.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasPermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { callbacks } from '../../../callbacks'; +import { Notifications } from '../../../notifications'; +import { Users } from '../../../models'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/lib/server/methods/filterBadWords.js b/app/lib/server/methods/filterBadWords.js index 27c10e4d436..f7c4b6f594e 100644 --- a/app/lib/server/methods/filterBadWords.js +++ b/app/lib/server/methods/filterBadWords.js @@ -1,6 +1,6 @@ import Filter from 'bad-words'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; callbacks.add('beforeSaveMessage', function(message) { diff --git a/app/lib/server/methods/getChannelHistory.js b/app/lib/server/methods/getChannelHistory.js index 35f9548917f..aa66252551f 100644 --- a/app/lib/server/methods/getChannelHistory.js +++ b/app/lib/server/methods/getChannelHistory.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { hasPermission } from '../../../authorization'; +import { Subscriptions, Messages } from '../../../models'; +import { settings } from '../../../settings'; +import { composeMessageObjectWithUser } from '../../../utils'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/lib/server/methods/getRoomJoinCode.js b/app/lib/server/methods/getRoomJoinCode.js index fdceca49d44..adc4fa7cc83 100644 --- a/app/lib/server/methods/getRoomJoinCode.js +++ b/app/lib/server/methods/getRoomJoinCode.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; Meteor.methods({ getRoomJoinCode(rid) { diff --git a/app/lib/server/methods/getRoomMessageMetadata.js b/app/lib/server/methods/getRoomMessageMetadata.js index cfa0b3ae72f..3bc84bbc389 100644 --- a/app/lib/server/methods/getRoomMessageMetadata.js +++ b/app/lib/server/methods/getRoomMessageMetadata.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.methods({ /** * Non-reactively retrieves metadata about messages of a room diff --git a/app/lib/server/methods/getRoomRoles.js b/app/lib/server/methods/getRoomRoles.js index bd625249fd4..fc92f5a1a4a 100644 --- a/app/lib/server/methods/getRoomRoles.js +++ b/app/lib/server/methods/getRoomRoles.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { Subscriptions, Users, Roles } from '/app/models'; +import { settings } from '../../../settings'; +import { Subscriptions, Users, Roles } from '../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/lib/server/methods/getServerInfo.js b/app/lib/server/methods/getServerInfo.js index e3da082140c..97aa99eb7b4 100644 --- a/app/lib/server/methods/getServerInfo.js +++ b/app/lib/server/methods/getServerInfo.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Info } from '/app/utils'; +import { Info } from '../../../utils'; Meteor.methods({ getServerInfo() { diff --git a/app/lib/server/methods/getSingleMessage.js b/app/lib/server/methods/getSingleMessage.js index e4908617e1a..74625cf76f9 100644 --- a/app/lib/server/methods/getSingleMessage.js +++ b/app/lib/server/methods/getSingleMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.methods({ getSingleMessage(msgId) { diff --git a/app/lib/server/methods/getSlashCommandPreviews.js b/app/lib/server/methods/getSlashCommandPreviews.js index 2b66dc99df8..6052720c20b 100644 --- a/app/lib/server/methods/getSlashCommandPreviews.js +++ b/app/lib/server/methods/getSlashCommandPreviews.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../../utils'; Meteor.methods({ getSlashCommandPreviews(command) { diff --git a/app/lib/server/methods/getUserRoles.js b/app/lib/server/methods/getUserRoles.js index 92735e62e80..1bd48b9bf97 100644 --- a/app/lib/server/methods/getUserRoles.js +++ b/app/lib/server/methods/getUserRoles.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Roles, Users } from '/app/models'; +import { Roles, Users } from '../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/lib/server/methods/joinRoom.js b/app/lib/server/methods/joinRoom.js index eb8ab19e8c6..b6ab8274d63 100644 --- a/app/lib/server/methods/joinRoom.js +++ b/app/lib/server/methods/joinRoom.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission, canAccessRoom } from '/app/authorization'; -import { Rooms } from '/app/models'; -import { Tokenpass, updateUserTokenpassBalances } from '/app/tokenpass'; +import { hasPermission, canAccessRoom } from '../../../authorization'; +import { Rooms } from '../../../models'; +import { Tokenpass, updateUserTokenpassBalances } from '../../../tokenpass'; import { addUserToRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/leaveRoom.js b/app/lib/server/methods/leaveRoom.js index 090af189743..1140b2065b2 100644 --- a/app/lib/server/methods/leaveRoom.js +++ b/app/lib/server/methods/leaveRoom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission, hasRole, getUsersInRole } from '/app/authorization'; -import { Subscriptions, Rooms } from '/app/models'; +import { hasPermission, hasRole, getUsersInRole } from '../../../authorization'; +import { Subscriptions, Rooms } from '../../../models'; import { removeUserFromRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/refreshOAuthService.js b/app/lib/server/methods/refreshOAuthService.js index 6f494a32b5b..59eced263e5 100644 --- a/app/lib/server/methods/refreshOAuthService.js +++ b/app/lib/server/methods/refreshOAuthService.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { hasPermission } from '/app/authorization'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Settings } from '../../../models'; Meteor.methods({ refreshOAuthService() { diff --git a/app/lib/server/methods/removeOAuthService.js b/app/lib/server/methods/removeOAuthService.js index 7506b53e4f4..570fa9182b2 100644 --- a/app/lib/server/methods/removeOAuthService.js +++ b/app/lib/server/methods/removeOAuthService.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; import s from 'underscore.string'; Meteor.methods({ diff --git a/app/lib/server/methods/restartServer.js b/app/lib/server/methods/restartServer.js index 2b13d7377da..0a84437791f 100644 --- a/app/lib/server/methods/restartServer.js +++ b/app/lib/server/methods/restartServer.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../../authorization'; Meteor.methods({ restart_server() { diff --git a/app/lib/server/methods/robotMethods.js b/app/lib/server/methods/robotMethods.js index 49905bc49e4..dffe2f04682 100644 --- a/app/lib/server/methods/robotMethods.js +++ b/app/lib/server/methods/robotMethods.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasRole } from '/app/authorization'; -import * as Models from '/app/models'; +import { hasRole } from '../../../authorization'; +import * as Models from '../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/lib/server/methods/saveSetting.js b/app/lib/server/methods/saveSetting.js index f5f90a82d80..cb6b1a60380 100644 --- a/app/lib/server/methods/saveSetting.js +++ b/app/lib/server/methods/saveSetting.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; +import { Settings } from '../../../models'; Meteor.methods({ saveSetting(_id, value, editor) { diff --git a/app/lib/server/methods/saveSettings.js b/app/lib/server/methods/saveSettings.js index 8e2d87477dc..e1028b995ce 100644 --- a/app/lib/server/methods/saveSettings.js +++ b/app/lib/server/methods/saveSettings.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; +import { Settings } from '../../../models'; Meteor.methods({ saveSettings(params = []) { diff --git a/app/lib/server/methods/sendInvitationEmail.js b/app/lib/server/methods/sendInvitationEmail.js index bcb4eb62939..efe8e86773b 100644 --- a/app/lib/server/methods/sendInvitationEmail.js +++ b/app/lib/server/methods/sendInvitationEmail.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import * as Mailer from '/app/mailer'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import * as Mailer from '../../../mailer'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; let html = ''; Meteor.startup(() => { diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js index 702d39c607d..d298dc53644 100644 --- a/app/lib/server/methods/sendMessage.js +++ b/app/lib/server/methods/sendMessage.js @@ -2,12 +2,12 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasPermission } from '/app/authorization'; -import { metrics } from '/app/metrics'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { messageProperties } from '/app/ui-utils'; -import { Subscriptions, Users } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { metrics } from '../../../metrics'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; +import { messageProperties } from '../../../ui-utils'; +import { Subscriptions, Users } from '../../../models'; import { sendMessage } from '../functions'; import { RateLimiter } from '../lib'; import moment from 'moment'; diff --git a/app/lib/server/methods/sendSMTPTestEmail.js b/app/lib/server/methods/sendSMTPTestEmail.js index a3cc63d688f..0da49f5fa5f 100644 --- a/app/lib/server/methods/sendSMTPTestEmail.js +++ b/app/lib/server/methods/sendSMTPTestEmail.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import * as Mailer from '/app/mailer'; -import { settings } from '/app/settings'; +import * as Mailer from '../../../mailer'; +import { settings } from '../../../settings'; Meteor.methods({ sendSMTPTestEmail() { diff --git a/app/lib/server/methods/setAdminStatus.js b/app/lib/server/methods/setAdminStatus.js index cf427f9cdb2..a3bdea0306a 100644 --- a/app/lib/server/methods/setAdminStatus.js +++ b/app/lib/server/methods/setAdminStatus.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; Meteor.methods({ setAdminStatus(userId, admin) { diff --git a/app/lib/server/methods/setEmail.js b/app/lib/server/methods/setEmail.js index a34f41fac61..2a6e99cad53 100644 --- a/app/lib/server/methods/setEmail.js +++ b/app/lib/server/methods/setEmail.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { setEmail } from '../functions'; import { RateLimiter } from '../lib'; diff --git a/app/lib/server/methods/setRealName.js b/app/lib/server/methods/setRealName.js index 9ade9a59f8a..4deb66420df 100644 --- a/app/lib/server/methods/setRealName.js +++ b/app/lib/server/methods/setRealName.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { setRealName } from '../functions'; import { RateLimiter } from '../lib'; diff --git a/app/lib/server/methods/setUsername.js b/app/lib/server/methods/setUsername.js index fa893fdfa01..2047f51ccc4 100644 --- a/app/lib/server/methods/setUsername.js +++ b/app/lib/server/methods/setUsername.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../../settings'; +import { Users } from '../../../models'; +import { callbacks } from '../../../callbacks'; import { setUsername, checkUsernameAvailability } from '../functions'; import { RateLimiter } from '../lib'; import _ from 'underscore'; diff --git a/app/lib/server/methods/unarchiveRoom.js b/app/lib/server/methods/unarchiveRoom.js index e7dc661373b..3399c150428 100644 --- a/app/lib/server/methods/unarchiveRoom.js +++ b/app/lib/server/methods/unarchiveRoom.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; import { unarchiveRoom } from '../functions'; Meteor.methods({ diff --git a/app/lib/server/methods/unblockUser.js b/app/lib/server/methods/unblockUser.js index 0f642ea5430..b06c3cc0b8a 100644 --- a/app/lib/server/methods/unblockUser.js +++ b/app/lib/server/methods/unblockUser.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../../models'; Meteor.methods({ unblockUser({ rid, blocked }) { diff --git a/app/lib/server/methods/updateMessage.js b/app/lib/server/methods/updateMessage.js index ddbfdc6e07d..7721dea7f3c 100644 --- a/app/lib/server/methods/updateMessage.js +++ b/app/lib/server/methods/updateMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; +import { Messages } from '../../../models'; +import { settings } from '../../../settings'; +import { hasPermission } from '../../../authorization'; import moment from 'moment'; import { updateMessage } from '../functions'; diff --git a/app/lib/server/oauth/proxy.js b/app/lib/server/oauth/proxy.js index 9026d538d70..0a022b4ec48 100644 --- a/app/lib/server/oauth/proxy.js +++ b/app/lib/server/oauth/proxy.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { OAuth } from 'meteor/oauth'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; OAuth._redirectUri = _.wrap(OAuth._redirectUri, function(func, serviceName, ...args) { const proxy = settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(','); diff --git a/app/lib/server/publications/settings.js b/app/lib/server/publications/settings.js index 53cd0810ce1..23daae7e5e9 100644 --- a/app/lib/server/publications/settings.js +++ b/app/lib/server/publications/settings.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Settings } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { Notifications } from '/app/notifications'; +import { Settings } from '../../../models'; +import { hasPermission } from '../../../authorization'; +import { Notifications } from '../../../notifications'; Meteor.methods({ 'public-settings/get'(updatedAt) { diff --git a/app/lib/server/startup/email.js b/app/lib/server/startup/email.js index 3421d7490cf..c86347a4b3d 100644 --- a/app/lib/server/startup/email.js +++ b/app/lib/server/startup/email.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('Email', function() { this.section('Style', function() { diff --git a/app/lib/server/startup/oAuthServicesUpdate.js b/app/lib/server/startup/oAuthServicesUpdate.js index 6c7d410d4c8..f48e173312f 100644 --- a/app/lib/server/startup/oAuthServicesUpdate.js +++ b/app/lib/server/startup/oAuthServicesUpdate.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { CustomOAuth } from '/app/custom-oauth'; -import { Logger } from '/app/logger'; -import { settings } from '/app/settings'; +import { CustomOAuth } from '../../../custom-oauth'; +import { Logger } from '../../../logger'; +import { settings } from '../../../settings'; import _ from 'underscore'; const logger = new Logger('rocketchat:lib', { diff --git a/app/lib/server/startup/rateLimiter.js b/app/lib/server/startup/rateLimiter.js index f47b2a4fc72..e4ff5076011 100644 --- a/app/lib/server/startup/rateLimiter.js +++ b/app/lib/server/startup/rateLimiter.js @@ -2,8 +2,8 @@ import _ from 'underscore'; import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; import { RateLimiter } from 'meteor/rate-limit'; -import { settings } from '/app/settings'; -import { metrics } from '/app/metrics'; +import { settings } from '../../../settings'; +import { metrics } from '../../../metrics'; // Get initial set of names already registered for rules const names = new Set(Object.values(DDPRateLimiter.printRules()) diff --git a/app/lib/server/startup/robots.js b/app/lib/server/startup/robots.js index 39a74c2a152..db6ff94a948 100644 --- a/app/lib/server/startup/robots.js +++ b/app/lib/server/startup/robots.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Meteor.startup(function() { return WebApp.connectHandlers.use('/robots.txt', Meteor.bindEnvironment(function(req, res/* , next*/) { diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js index 10a47dad41e..bd773f1e915 100644 --- a/app/lib/server/startup/settings.js +++ b/app/lib/server/startup/settings.js @@ -1,5 +1,5 @@ import { Random } from 'meteor/random'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import './email'; // Insert server unique id if it doesn't exist diff --git a/app/lib/server/startup/settingsOnLoadCdnPrefix.js b/app/lib/server/startup/settingsOnLoadCdnPrefix.js index 4a9dd94ce48..820eabbd9d4 100644 --- a/app/lib/server/startup/settingsOnLoadCdnPrefix.js +++ b/app/lib/server/startup/settingsOnLoadCdnPrefix.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { WebAppInternals } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; function testWebAppInternals(fn) { diff --git a/app/lib/server/startup/settingsOnLoadDirectReply.js b/app/lib/server/startup/settingsOnLoadDirectReply.js index bc50ee1478b..7cc0b77cc3c 100644 --- a/app/lib/server/startup/settingsOnLoadDirectReply.js +++ b/app/lib/server/startup/settingsOnLoadDirectReply.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; import { IMAPIntercepter, POP3Helper } from '../lib/interceptDirectReplyEmails.js'; import { POP3 } from '../lib/interceptDirectReplyEmails'; diff --git a/app/lib/server/startup/settingsOnLoadSMTP.js b/app/lib/server/startup/settingsOnLoadSMTP.js index d7542b3adae..2beef6a6f76 100644 --- a/app/lib/server/startup/settingsOnLoadSMTP.js +++ b/app/lib/server/startup/settingsOnLoadSMTP.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; const buildMailURL = _.debounce(function() { diff --git a/app/lib/startup/defaultRoomTypes.js b/app/lib/startup/defaultRoomTypes.js index 1f570c878aa..a5b844aebd3 100644 --- a/app/lib/startup/defaultRoomTypes.js +++ b/app/lib/startup/defaultRoomTypes.js @@ -1,4 +1,4 @@ -import { roomTypes } from '/app/utils'; +import { roomTypes } from '../../utils'; import { ConversationRoomType, DirectMessageRoomType, diff --git a/app/lib/startup/index.js b/app/lib/startup/index.js index cda8fdd56b5..06021c74183 100644 --- a/app/lib/startup/index.js +++ b/app/lib/startup/index.js @@ -1,4 +1,4 @@ -import * as Mailer from '/app/mailer'; -import { settings } from '/app/settings'; +import * as Mailer from '../../mailer'; +import { settings } from '../../settings'; Mailer.setSettings(settings); diff --git a/app/livechat/client/lib/dateHandler.js b/app/livechat/client/lib/dateHandler.js index 74fbf357256..e6ebc213246 100644 --- a/app/livechat/client/lib/dateHandler.js +++ b/app/livechat/client/lib/dateHandler.js @@ -1,4 +1,4 @@ -import { handleError } from '/app/utils'; +import { handleError } from '../../../utils'; import moment from 'moment'; diff --git a/app/livechat/client/roomType.js b/app/livechat/client/roomType.js index f7de79bf67d..4209e4f617c 100644 --- a/app/livechat/client/roomType.js +++ b/app/livechat/client/roomType.js @@ -1,4 +1,4 @@ -import { roomTypes } from '/app/utils'; +import { roomTypes } from '../../utils'; import LivechatRoomType from '../lib/LivechatRoomType'; roomTypes.add(new LivechatRoomType()); diff --git a/app/livechat/client/route.js b/app/livechat/client/route.js index d9514e60bdb..174e3a37f4e 100644 --- a/app/livechat/client/route.js +++ b/app/livechat/client/route.js @@ -1,5 +1,5 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; -import { AccountBox } from '/app/ui-utils'; +import { AccountBox } from '../../ui-utils'; const livechatManagerRoutes = FlowRouter.group({ prefix: '/livechat-manager', diff --git a/app/livechat/client/startup/notifyUnreadRooms.js b/app/livechat/client/startup/notifyUnreadRooms.js index 16ed68f2ee2..e2256129ccf 100644 --- a/app/livechat/client/startup/notifyUnreadRooms.js +++ b/app/livechat/client/startup/notifyUnreadRooms.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { getUserPreference } from '/app/utils'; -import { Subscriptions, Users } from '/app/models'; +import { settings } from '../../../settings'; +import { getUserPreference } from '../../../utils'; +import { Subscriptions, Users } from '../../../models'; let audio = null; diff --git a/app/livechat/client/ui.js b/app/livechat/client/ui.js index c6d7908a04a..1e206e1af4d 100644 --- a/app/livechat/client/ui.js +++ b/app/livechat/client/ui.js @@ -1,6 +1,6 @@ -import { settings } from '/app/settings'; -import { hasAllPermission } from '/app/authorization'; -import { AccountBox, TabBar, MessageTypes } from '/app/ui-utils'; +import { settings } from '../../settings'; +import { hasAllPermission } from '../../authorization'; +import { AccountBox, TabBar, MessageTypes } from '../../ui-utils'; AccountBox.addItem({ name: 'Livechat', diff --git a/app/livechat/client/views/app/analytics/livechatAnalytics.js b/app/livechat/client/views/app/analytics/livechatAnalytics.js index c6f99b32fc0..e23b738ad0a 100644 --- a/app/livechat/client/views/app/analytics/livechatAnalytics.js +++ b/app/livechat/client/views/app/analytics/livechatAnalytics.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { handleError } from '/app/utils'; -import { popover } from '/app/ui-utils'; +import { handleError } from '../../../../../utils'; +import { popover } from '../../../../../ui-utils'; import moment from 'moment'; import { drawLineChart } from '../../../lib/chartHandler'; import { setDateRange, updateDateRange } from '../../../lib/dateHandler'; diff --git a/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js b/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js index ed8aa91bb34..b1da270f6dc 100644 --- a/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js +++ b/app/livechat/client/views/app/analytics/livechatAnalyticsCustomDaterange.js @@ -1,6 +1,6 @@ import { Template } from 'meteor/templating'; -import { handleError } from '/app/utils'; -import { popover } from '/app/ui-utils'; +import { handleError } from '../../../../../utils'; +import { popover } from '../../../../../ui-utils'; import moment from 'moment'; import { setDateRange } from '../../../lib/dateHandler'; diff --git a/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js b/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js index 9e1ef037411..7a0413caf1c 100644 --- a/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js +++ b/app/livechat/client/views/app/analytics/livechatAnalyticsDaterange.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { popover } from '/app/ui-utils'; +import { popover } from '../../../../../ui-utils'; import moment from 'moment'; import { setDateRange } from '../../../lib/dateHandler'; diff --git a/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js index 85fb0591feb..ac8f5ab2064 100644 --- a/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js +++ b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../../ui-utils'; +import { t, handleError } from '../../../../../utils'; Template.livechatIntegrationFacebook.helpers({ pages() { diff --git a/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js index 43ac5fc1ed4..7fd6c4ae12b 100644 --- a/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js +++ b/app/livechat/client/views/app/integrations/livechatIntegrationWebhook.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../../ui-utils'; +import { t, handleError } from '../../../../../utils'; import { LivechatIntegration } from '../../../collections/LivechatIntegration'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/livechat/client/views/app/livechatAppearance.js b/app/livechat/client/views/app/livechatAppearance.js index 76218560f2f..5ed96cdfb09 100644 --- a/app/livechat/client/views/app/livechatAppearance.js +++ b/app/livechat/client/views/app/livechatAppearance.js @@ -4,7 +4,7 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../../utils'; import s from 'underscore.string'; import moment from 'moment'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/livechatCurrentChats.js b/app/livechat/client/views/app/livechatCurrentChats.js index a00fbf52018..b0f7147ceab 100644 --- a/app/livechat/client/views/app/livechatCurrentChats.js +++ b/app/livechat/client/views/app/livechatCurrentChats.js @@ -3,8 +3,8 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { AgentUsers } from '../../collections/AgentUsers'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/livechat/client/views/app/livechatCustomFieldForm.js b/app/livechat/client/views/app/livechatCustomFieldForm.js index 93e231aca9b..2e9183af4d2 100644 --- a/app/livechat/client/views/app/livechatCustomFieldForm.js +++ b/app/livechat/client/views/app/livechatCustomFieldForm.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../../utils'; import { LivechatCustomField } from '../../collections/LivechatCustomField'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/livechatCustomFields.js b/app/livechat/client/views/app/livechatCustomFields.js index 33dd2f77b5a..0d51b100131 100644 --- a/app/livechat/client/views/app/livechatCustomFields.js +++ b/app/livechat/client/views/app/livechatCustomFields.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { LivechatCustomField } from '../../collections/LivechatCustomField'; Template.livechatCustomFields.helpers({ diff --git a/app/livechat/client/views/app/livechatDepartmentForm.js b/app/livechat/client/views/app/livechatDepartmentForm.js index 43b29bce80a..b95d7dab060 100644 --- a/app/livechat/client/views/app/livechatDepartmentForm.js +++ b/app/livechat/client/views/app/livechatDepartmentForm.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../../utils'; import { AgentUsers } from '../../collections/AgentUsers'; import { LivechatDepartment } from '../../collections/LivechatDepartment'; import { LivechatDepartmentAgents } from '../../collections/LivechatDepartmentAgents'; diff --git a/app/livechat/client/views/app/livechatDepartments.js b/app/livechat/client/views/app/livechatDepartments.js index 0f57b84299c..4983d7dd3c9 100644 --- a/app/livechat/client/views/app/livechatDepartments.js +++ b/app/livechat/client/views/app/livechatDepartments.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { LivechatDepartment } from '../../collections/LivechatDepartment'; Template.livechatDepartments.helpers({ diff --git a/app/livechat/client/views/app/livechatInstallation.js b/app/livechat/client/views/app/livechatInstallation.js index 900f351b5c1..13edd998d83 100644 --- a/app/livechat/client/views/app/livechatInstallation.js +++ b/app/livechat/client/views/app/livechatInstallation.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import s from 'underscore.string'; Template.livechatInstallation.helpers({ diff --git a/app/livechat/client/views/app/livechatOfficeHours.js b/app/livechat/client/views/app/livechatOfficeHours.js index 5b26a151676..e8bc889bf6d 100644 --- a/app/livechat/client/views/app/livechatOfficeHours.js +++ b/app/livechat/client/views/app/livechatOfficeHours.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; -import { settings } from '/app/settings'; +import { t, handleError } from '../../../../utils'; +import { settings } from '../../../../settings'; import { LivechatOfficeHour } from '../../collections/livechatOfficeHour'; import toastr from 'toastr'; import moment from 'moment'; diff --git a/app/livechat/client/views/app/livechatQueue.js b/app/livechat/client/views/app/livechatQueue.js index 91bbfb4e7d1..d214866a0bc 100644 --- a/app/livechat/client/views/app/livechatQueue.js +++ b/app/livechat/client/views/app/livechatQueue.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; -import { Users } from '/app/models'; +import { settings } from '../../../../settings'; +import { hasRole } from '../../../../authorization'; +import { Users } from '../../../../models'; import { LivechatDepartment } from '../../collections/LivechatDepartment'; import { LivechatQueueUser } from '../../collections/LivechatQueueUser'; import { AgentUsers } from '../../collections/AgentUsers'; diff --git a/app/livechat/client/views/app/livechatTriggers.js b/app/livechat/client/views/app/livechatTriggers.js index 8122deb83a1..69632b2237e 100644 --- a/app/livechat/client/views/app/livechatTriggers.js +++ b/app/livechat/client/views/app/livechatTriggers.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { LivechatTrigger } from '../../collections/LivechatTrigger'; Template.livechatTriggers.helpers({ diff --git a/app/livechat/client/views/app/livechatTriggersForm.js b/app/livechat/client/views/app/livechatTriggersForm.js index 30fcca343f3..32f04919069 100644 --- a/app/livechat/client/views/app/livechatTriggersForm.js +++ b/app/livechat/client/views/app/livechatTriggersForm.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../../utils'; import { LivechatTrigger } from '../../collections/LivechatTrigger'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/livechatUsers.js b/app/livechat/client/views/app/livechatUsers.js index 89e6cd3bc1a..85c3e8907ce 100644 --- a/app/livechat/client/views/app/livechatUsers.js +++ b/app/livechat/client/views/app/livechatUsers.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { AgentUsers } from '../../collections/AgentUsers'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/tabbar/visitorEdit.js b/app/livechat/client/views/app/tabbar/visitorEdit.js index f96f289a8c4..b0158c253fc 100644 --- a/app/livechat/client/views/app/tabbar/visitorEdit.js +++ b/app/livechat/client/views/app/tabbar/visitorEdit.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { ChatRoom } from '/app/models'; -import { t } from '/app/utils'; +import { ChatRoom } from '../../../../../models'; +import { t } from '../../../../../utils'; import { LivechatVisitor } from '../../../collections/LivechatVisitor'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/tabbar/visitorForward.js b/app/livechat/client/views/app/tabbar/visitorForward.js index 49bec3c9639..e579c7a192d 100644 --- a/app/livechat/client/views/app/tabbar/visitorForward.js +++ b/app/livechat/client/views/app/tabbar/visitorForward.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { ChatRoom } from '/app/models'; -import { t } from '/app/utils'; +import { ChatRoom } from '../../../../../models'; +import { t } from '../../../../../utils'; import { LivechatDepartment } from '../../../collections/LivechatDepartment'; import { AgentUsers } from '../../../collections/AgentUsers'; import toastr from 'toastr'; diff --git a/app/livechat/client/views/app/tabbar/visitorHistory.js b/app/livechat/client/views/app/tabbar/visitorHistory.js index 31486aedb66..320161518ec 100644 --- a/app/livechat/client/views/app/tabbar/visitorHistory.js +++ b/app/livechat/client/views/app/tabbar/visitorHistory.js @@ -1,4 +1,4 @@ -import { ChatRoom } from '/app/models'; +import { ChatRoom } from '../../../../../models'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { Mongo } from 'meteor/mongo'; diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js index dd95a68452e..1f7bda2560c 100644 --- a/app/livechat/client/views/app/tabbar/visitorInfo.js +++ b/app/livechat/client/views/app/tabbar/visitorInfo.js @@ -3,11 +3,11 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { ChatRoom, Rooms, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { t, handleError, roomTypes } from '/app/utils'; -import { hasRole } from '/app/authorization'; +import { modal } from '../../../../../ui-utils'; +import { ChatRoom, Rooms, Subscriptions } from '../../../../../models'; +import { settings } from '../../../../../settings'; +import { t, handleError, roomTypes } from '../../../../../utils'; +import { hasRole } from '../../../../../authorization'; import { LivechatVisitor } from '../../../collections/LivechatVisitor'; import { LivechatDepartment } from '../../../collections/LivechatDepartment'; import _ from 'underscore'; diff --git a/app/livechat/client/views/app/tabbar/visitorNavigation.js b/app/livechat/client/views/app/tabbar/visitorNavigation.js index 5f2e4b8c820..7a90148aebd 100644 --- a/app/livechat/client/views/app/tabbar/visitorNavigation.js +++ b/app/livechat/client/views/app/tabbar/visitorNavigation.js @@ -1,7 +1,7 @@ import { Mongo } from 'meteor/mongo'; import { Template } from 'meteor/templating'; -import { ChatRoom } from '/app/models'; -import { t } from '/app/utils'; +import { ChatRoom } from '../../../../../models'; +import { t } from '../../../../../utils'; import moment from 'moment'; const visitorNavigationHistory = new Mongo.Collection('visitor_navigation_history'); diff --git a/app/livechat/client/views/app/triggers/livechatTriggerAction.js b/app/livechat/client/views/app/triggers/livechatTriggerAction.js index 47c9e555c96..4f3db13189a 100644 --- a/app/livechat/client/views/app/triggers/livechatTriggerAction.js +++ b/app/livechat/client/views/app/triggers/livechatTriggerAction.js @@ -1,6 +1,6 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../../../settings'; Template.livechatTriggerAction.helpers({ hiddenValue(current) { diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js index e9e398f0dda..727a24c3fc1 100644 --- a/app/livechat/client/views/sideNav/livechat.js +++ b/app/livechat/client/views/sideNav/livechat.js @@ -3,13 +3,13 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { ChatSubscription } from '/app/models'; -import { KonchatNotification } from '/app/ui'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; -import { modal } from '/app/ui-utils'; -import { Users } from '/app/models'; -import { t, handleError, getUserPreference, roomTypes } from '/app/utils'; +import { ChatSubscription } from '../../../../models'; +import { KonchatNotification } from '../../../../ui'; +import { settings } from '../../../../settings'; +import { hasRole } from '../../../../authorization'; +import { modal } from '../../../../ui-utils'; +import { Users } from '../../../../models'; +import { t, handleError, getUserPreference, roomTypes } from '../../../../utils'; import { LivechatInquiry } from '../../../lib/LivechatInquiry'; Template.livechat.helpers({ diff --git a/app/livechat/client/views/sideNav/livechatFlex.js b/app/livechat/client/views/sideNav/livechatFlex.js index 54ff3146d1e..363c52a2094 100644 --- a/app/livechat/client/views/sideNav/livechatFlex.js +++ b/app/livechat/client/views/sideNav/livechatFlex.js @@ -1,6 +1,6 @@ import { Template } from 'meteor/templating'; -import { SideNav, Layout } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { SideNav, Layout } from '../../../../ui-utils'; +import { t } from '../../../../utils'; Template.livechatFlex.helpers({ menuItem(name, icon, section) { diff --git a/app/livechat/imports/server/rest/departments.js b/app/livechat/imports/server/rest/departments.js index b76c3a098a6..337c4d523ed 100644 --- a/app/livechat/imports/server/rest/departments.js +++ b/app/livechat/imports/server/rest/departments.js @@ -1,7 +1,7 @@ import { check } from 'meteor/check'; -import { API } from '/app/api'; -import { hasPermission } from '/app/authorization'; -import { LivechatDepartment, LivechatDepartmentAgents } from '/app/models'; +import { API } from '../../../../api'; +import { hasPermission } from '../../../../authorization'; +import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models'; import { Livechat } from '../../../server/lib/Livechat'; API.v1.addRoute('livechat/department', { authRequired: true }, { diff --git a/app/livechat/imports/server/rest/facebook.js b/app/livechat/imports/server/rest/facebook.js index 4cec762b54d..9637f386952 100644 --- a/app/livechat/imports/server/rest/facebook.js +++ b/app/livechat/imports/server/rest/facebook.js @@ -1,8 +1,8 @@ import crypto from 'crypto'; import { Random } from 'meteor/random'; -import { API } from '/app/api'; -import { Rooms, Users, LivechatVisitors } from '/app/models'; -import { settings } from '/app/settings'; +import { API } from '../../../../api'; +import { Rooms, Users, LivechatVisitors } from '../../../../models'; +import { settings } from '../../../../settings'; import { Livechat } from '../../../server/lib/Livechat'; /** diff --git a/app/livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js index d70b4ac707f..5eec0dd39b5 100644 --- a/app/livechat/imports/server/rest/sms.js +++ b/app/livechat/imports/server/rest/sms.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { Rooms, LivechatVisitors } from '/app/models'; -import { API } from '/app/api'; -import { SMS } from '/app/sms'; +import { Rooms, LivechatVisitors } from '../../../../models'; +import { API } from '../../../../api'; +import { SMS } from '../../../../sms'; import { Livechat } from '../../../server/lib/Livechat'; API.v1.addRoute('livechat/sms-incoming/:service', { diff --git a/app/livechat/imports/server/rest/upload.js b/app/livechat/imports/server/rest/upload.js index b9882d4d083..6ec96c1d494 100644 --- a/app/livechat/imports/server/rest/upload.js +++ b/app/livechat/imports/server/rest/upload.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Settings, Rooms, LivechatVisitors } from '/app/models'; -import { fileUploadIsValidContentType } from '/app/utils'; -import { FileUpload } from '/app/file-upload'; -import { API } from '/app/api'; +import { settings } from '../../../../settings'; +import { Settings, Rooms, LivechatVisitors } from '../../../../models'; +import { fileUploadIsValidContentType } from '../../../../utils'; +import { FileUpload } from '../../../../file-upload'; +import { API } from '../../../../api'; import Busboy from 'busboy'; import filesize from 'filesize'; let maxFileSize; diff --git a/app/livechat/imports/server/rest/users.js b/app/livechat/imports/server/rest/users.js index 06c2fe16a19..6da74562a86 100644 --- a/app/livechat/imports/server/rest/users.js +++ b/app/livechat/imports/server/rest/users.js @@ -1,7 +1,7 @@ import { check } from 'meteor/check'; -import { hasPermission, getUsersInRole } from '/app/authorization'; -import { API } from '/app/api'; -import { Users } from '/app/models'; +import { hasPermission, getUsersInRole } from '../../../../authorization'; +import { API } from '../../../../api'; +import { Users } from '../../../../models'; import { Livechat } from '../../../server/lib/Livechat'; import _ from 'underscore'; diff --git a/app/livechat/lib/LivechatExternalMessage.js b/app/livechat/lib/LivechatExternalMessage.js index 8c38b42c222..b391143680a 100644 --- a/app/livechat/lib/LivechatExternalMessage.js +++ b/app/livechat/lib/LivechatExternalMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Base } from '/app/models'; +import { Base } from '../../models'; class LivechatExternalMessageClass extends Base { constructor() { diff --git a/app/livechat/lib/LivechatInquiry.js b/app/livechat/lib/LivechatInquiry.js index a7629afda3e..9da291e925e 100644 --- a/app/livechat/lib/LivechatInquiry.js +++ b/app/livechat/lib/LivechatInquiry.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Base } from '/app/models'; +import { Base } from '../../models'; import { Mongo } from 'meteor/mongo'; export let LivechatInquiry; diff --git a/app/livechat/lib/LivechatRoomType.js b/app/livechat/lib/LivechatRoomType.js index b5d599f9eb4..26f0680bcef 100644 --- a/app/livechat/lib/LivechatRoomType.js +++ b/app/livechat/lib/LivechatRoomType.js @@ -1,9 +1,9 @@ import { Session } from 'meteor/session'; -import { ChatRoom } from '/app/models'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; -import { openRoom } from '/app/ui-utils'; -import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '/app/utils'; +import { ChatRoom } from '../../models'; +import { settings } from '../../settings'; +import { hasPermission } from '../../authorization'; +import { openRoom } from '../../ui-utils'; +import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils'; import { LivechatInquiry } from './LivechatInquiry'; class LivechatRoomRoute extends RoomTypeRouteConfig { diff --git a/app/livechat/lib/messageTypes.js b/app/livechat/lib/messageTypes.js index a1f27759213..aeb53a6d5ae 100644 --- a/app/livechat/lib/messageTypes.js +++ b/app/livechat/lib/messageTypes.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { MessageTypes } from '/app/ui-utils'; -import { actionLinks } from '/app/action-links'; -import { Notifications } from '/app/notifications'; -import { Messages, Rooms } from '/app/models'; -import { settings } from '/app/settings'; +import { MessageTypes } from '../../ui-utils'; +import { actionLinks } from '../../action-links'; +import { Notifications } from '../../notifications'; +import { Messages, Rooms } from '../../models'; +import { settings } from '../../settings'; import { Livechat } from 'meteor/rocketchat:livechat'; MessageTypes.registerType({ diff --git a/app/livechat/server/agentStatus.js b/app/livechat/server/agentStatus.js index e7b7c2213a0..f9e499ffa47 100644 --- a/app/livechat/server/agentStatus.js +++ b/app/livechat/server/agentStatus.js @@ -1,4 +1,4 @@ -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../authorization'; import { UserPresenceMonitor } from 'meteor/konecty:user-presence'; import { Livechat } from './lib/Livechat'; diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js index e582122923a..1967cd8fbfa 100644 --- a/app/livechat/server/api/lib/livechat.js +++ b/app/livechat/server/api/lib/livechat.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { Users, Rooms, LivechatVisitors, LivechatDepartment, LivechatTrigger } from '/app/models'; +import { Users, Rooms, LivechatVisitors, LivechatDepartment, LivechatTrigger } from '../../../../models'; import _ from 'underscore'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/agent.js b/app/livechat/server/api/v1/agent.js index 1e753c654ed..ec091fa43b3 100644 --- a/app/livechat/server/api/v1/agent.js +++ b/app/livechat/server/api/v1/agent.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { API } from '/app/api'; +import { API } from '../../../../api'; import { findRoom, findGuest, findAgent, findOpenRoom } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js index 38a812ce961..58905379b9c 100644 --- a/app/livechat/server/api/v1/config.js +++ b/app/livechat/server/api/v1/config.js @@ -1,5 +1,5 @@ -import { Users } from '/app/models'; -import { API } from '/app/api'; +import { Users } from '../../../../models'; +import { API } from '../../../../api'; import { findGuest, settings, online, findOpenRoom } from '../lib/livechat'; import { Match, check } from 'meteor/check'; diff --git a/app/livechat/server/api/v1/customField.js b/app/livechat/server/api/v1/customField.js index 75fdbd8b18a..d210a0913cc 100644 --- a/app/livechat/server/api/v1/customField.js +++ b/app/livechat/server/api/v1/customField.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { API } from '/app/api'; +import { API } from '../../../../api'; import { findGuest } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js index f15a2727b68..f1e07e8ef74 100644 --- a/app/livechat/server/api/v1/message.js +++ b/app/livechat/server/api/v1/message.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; -import { Messages, Rooms, LivechatVisitors } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { API } from '/app/api'; -import { loadMessageHistory } from '/app/lib'; +import { Messages, Rooms, LivechatVisitors } from '../../../../models'; +import { hasPermission } from '../../../../authorization'; +import { API } from '../../../../api'; +import { loadMessageHistory } from '../../../../lib'; import { findGuest, findRoom } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/offlineMessage.js b/app/livechat/server/api/v1/offlineMessage.js index 2a01fc0cd4e..0e0df8f0c37 100644 --- a/app/livechat/server/api/v1/offlineMessage.js +++ b/app/livechat/server/api/v1/offlineMessage.js @@ -1,6 +1,6 @@ import { check } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { API } from '/app/api'; +import { API } from '../../../../api'; import { Livechat } from '../../lib/Livechat'; API.v1.addRoute('livechat/offline.message', { diff --git a/app/livechat/server/api/v1/pageVisited.js b/app/livechat/server/api/v1/pageVisited.js index 6ee06f3dc5a..1182717e28b 100644 --- a/app/livechat/server/api/v1/pageVisited.js +++ b/app/livechat/server/api/v1/pageVisited.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { API } from '/app/api'; +import { API } from '../../../../api'; import _ from 'underscore'; import { findGuest, findRoom } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js index 7dac7dac33a..b700bd89a37 100644 --- a/app/livechat/server/api/v1/room.js +++ b/app/livechat/server/api/v1/room.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings as rcSettings } from '/app/settings'; -import { Messages, Rooms } from '/app/models'; -import { API } from '/app/api'; +import { settings as rcSettings } from '../../../../settings'; +import { Messages, Rooms } from '../../../../models'; +import { API } from '../../../../api'; import { findGuest, findRoom, getRoom, settings } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js index 99095778cbb..c517d546a4e 100644 --- a/app/livechat/server/api/v1/transcript.js +++ b/app/livechat/server/api/v1/transcript.js @@ -1,6 +1,6 @@ import { check } from 'meteor/check'; import { TAPi18n } from 'meteor/tap:i18n'; -import { API } from '/app/api'; +import { API } from '../../../../api'; import { Livechat } from '../../lib/Livechat'; API.v1.addRoute('livechat/transcript', { diff --git a/app/livechat/server/api/v1/videoCall.js b/app/livechat/server/api/v1/videoCall.js index 3c0ebafb7d4..a200667a47c 100644 --- a/app/livechat/server/api/v1/videoCall.js +++ b/app/livechat/server/api/v1/videoCall.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; -import { Messages } from '/app/models'; -import { settings as rcSettings } from '/app/settings'; -import { API } from '/app/api'; +import { Messages } from '../../../../models'; +import { settings as rcSettings } from '../../../../settings'; +import { API } from '../../../../api'; import { findGuest, getRoom, settings } from '../lib/livechat'; API.v1.addRoute('livechat/video.call/:token', { diff --git a/app/livechat/server/api/v1/visitor.js b/app/livechat/server/api/v1/visitor.js index 54163033639..9b37cb41504 100644 --- a/app/livechat/server/api/v1/visitor.js +++ b/app/livechat/server/api/v1/visitor.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Rooms, LivechatVisitors, LivechatCustomField } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { API } from '/app/api'; +import { Rooms, LivechatVisitors, LivechatCustomField } from '../../../../models'; +import { hasPermission } from '../../../../authorization'; +import { API } from '../../../../api'; import { findGuest } from '../lib/livechat'; import { Livechat } from '../../lib/Livechat'; diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js index 9d737eceaca..84998ad8f72 100644 --- a/app/livechat/server/config.js +++ b/app/livechat/server/config.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('Livechat'); diff --git a/app/livechat/server/hooks/RDStation.js b/app/livechat/server/hooks/RDStation.js index effc1942a22..5254ae34877 100644 --- a/app/livechat/server/hooks/RDStation.js +++ b/app/livechat/server/hooks/RDStation.js @@ -1,6 +1,6 @@ import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; import { Livechat } from '../lib/Livechat'; function sendToRDStation(room) { diff --git a/app/livechat/server/hooks/externalMessage.js b/app/livechat/server/hooks/externalMessage.js index 1f179ff678a..2597deaeeaa 100644 --- a/app/livechat/server/hooks/externalMessage.js +++ b/app/livechat/server/hooks/externalMessage.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { SystemLogger } from '/app/logger'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { SystemLogger } from '../../../logger'; import { HTTP } from 'meteor/http'; import { LivechatExternalMessage } from '../../lib/LivechatExternalMessage'; import _ from 'underscore'; diff --git a/app/livechat/server/hooks/leadCapture.js b/app/livechat/server/hooks/leadCapture.js index 14382fe9518..7dd2092246b 100644 --- a/app/livechat/server/hooks/leadCapture.js +++ b/app/livechat/server/hooks/leadCapture.js @@ -1,6 +1,6 @@ -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { LivechatVisitors } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { settings } from '../../../settings'; +import { LivechatVisitors } from '../../../models'; function validateMessage(message, room) { // skips this callback if the message was edited diff --git a/app/livechat/server/hooks/markRoomResponded.js b/app/livechat/server/hooks/markRoomResponded.js index 310a9440814..7a4c2a9a621 100644 --- a/app/livechat/server/hooks/markRoomResponded.js +++ b/app/livechat/server/hooks/markRoomResponded.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { Rooms } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { Rooms } from '../../../models'; callbacks.add('afterSaveMessage', function(message, room) { // skips this callback if the message was edited diff --git a/app/livechat/server/hooks/offlineMessage.js b/app/livechat/server/hooks/offlineMessage.js index b9e6b5def8d..91a0641c3fd 100644 --- a/app/livechat/server/hooks/offlineMessage.js +++ b/app/livechat/server/hooks/offlineMessage.js @@ -1,5 +1,5 @@ -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; +import { callbacks } from '../../../callbacks'; +import { settings } from '../../../settings'; import { Livechat } from '../lib/Livechat'; callbacks.add('livechat.offlineMessage', (data) => { diff --git a/app/livechat/server/hooks/saveAnalyticsData.js b/app/livechat/server/hooks/saveAnalyticsData.js index 0508987d8cd..28654284748 100644 --- a/app/livechat/server/hooks/saveAnalyticsData.js +++ b/app/livechat/server/hooks/saveAnalyticsData.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { Rooms } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { Rooms } from '../../../models'; callbacks.add('afterSaveMessage', function(message, room) { // skips this callback if the message was edited diff --git a/app/livechat/server/hooks/sendToCRM.js b/app/livechat/server/hooks/sendToCRM.js index 34a894e9cee..a09b06177e9 100644 --- a/app/livechat/server/hooks/sendToCRM.js +++ b/app/livechat/server/hooks/sendToCRM.js @@ -1,6 +1,6 @@ -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Messages, Rooms } from '/app/models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { Messages, Rooms } from '../../../models'; import { Livechat } from '../lib/Livechat'; const msgNavType = 'livechat_navigation_history'; diff --git a/app/livechat/server/hooks/sendToFacebook.js b/app/livechat/server/hooks/sendToFacebook.js index 3dbeaede136..1977dffe270 100644 --- a/app/livechat/server/hooks/sendToFacebook.js +++ b/app/livechat/server/hooks/sendToFacebook.js @@ -1,5 +1,5 @@ -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; +import { callbacks } from '../../../callbacks'; +import { settings } from '../../../settings'; import OmniChannel from '../lib/OmniChannel'; callbacks.add('afterSaveMessage', function(message, room) { diff --git a/app/livechat/server/lib/Analytics.js b/app/livechat/server/lib/Analytics.js index 35736b3057e..4e9e5b88d78 100644 --- a/app/livechat/server/lib/Analytics.js +++ b/app/livechat/server/lib/Analytics.js @@ -1,4 +1,4 @@ -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; import moment from 'moment'; /** diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index e3cbaf2135e..a54631f1b0c 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -3,18 +3,18 @@ import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Users, Rooms, Messages, Subscriptions, Settings, LivechatDepartmentAgents, LivechatDepartment, LivechatCustomField, LivechatVisitors } from '/app/models'; -import { Logger } from '/app/logger'; -import { sendMessage, deleteMessage, updateMessage } from '/app/lib'; -import { addUserRoles, removeUserFromRoles } from '/app/authorization'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { Users, Rooms, Messages, Subscriptions, Settings, LivechatDepartmentAgents, LivechatDepartment, LivechatCustomField, LivechatVisitors } from '../../../models'; +import { Logger } from '../../../logger'; +import { sendMessage, deleteMessage, updateMessage } from '../../../lib'; +import { addUserRoles, removeUserFromRoles } from '../../../authorization'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; import dns from 'dns'; import UAParser from 'ua-parser-js'; -import * as Mailer from '/app/mailer'; +import * as Mailer from '../../../mailer'; import { LivechatInquiry } from '../../lib/LivechatInquiry'; import { QueueMethods } from './QueueMethods'; import { Analytics } from './Analytics'; diff --git a/app/livechat/server/lib/OfficeClock.js b/app/livechat/server/lib/OfficeClock.js index 7498f021303..8c5c96d2ea3 100644 --- a/app/livechat/server/lib/OfficeClock.js +++ b/app/livechat/server/lib/OfficeClock.js @@ -1,7 +1,7 @@ // Every minute check if office closed import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Users, LivechatOfficeHour } from '/app/models'; +import { settings } from '../../../settings'; +import { Users, LivechatOfficeHour } from '../../../models'; Meteor.setInterval(function() { if (settings.get('Livechat_enable_office_hours')) { diff --git a/app/livechat/server/lib/OmniChannel.js b/app/livechat/server/lib/OmniChannel.js index e1851d00454..b1eb1139b0d 100644 --- a/app/livechat/server/lib/OmniChannel.js +++ b/app/livechat/server/lib/OmniChannel.js @@ -1,5 +1,5 @@ import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; const gatewayURL = 'https://omni.rocket.chat'; diff --git a/app/livechat/server/lib/QueueMethods.js b/app/livechat/server/lib/QueueMethods.js index 9fab1c7d619..e03aa2c93e3 100644 --- a/app/livechat/server/lib/QueueMethods.js +++ b/app/livechat/server/lib/QueueMethods.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions, Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Rooms, Subscriptions, Users } from '../../../models'; +import { settings } from '../../../settings'; import _ from 'underscore'; -import { sendNotification } from '/app/lib'; +import { sendNotification } from '../../../lib'; import { LivechatInquiry } from '../../lib/LivechatInquiry'; import { Livechat } from './Livechat'; diff --git a/app/livechat/server/livechat.js b/app/livechat/server/livechat.js index dd3be11ee6d..9ad396433da 100644 --- a/app/livechat/server/livechat.js +++ b/app/livechat/server/livechat.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { Autoupdate } from 'meteor/autoupdate'; import _ from 'underscore'; import url from 'url'; diff --git a/app/livechat/server/methods/addAgent.js b/app/livechat/server/methods/addAgent.js index 32b4075c8cb..21b6884ffe6 100644 --- a/app/livechat/server/methods/addAgent.js +++ b/app/livechat/server/methods/addAgent.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/addManager.js b/app/livechat/server/methods/addManager.js index 1511412ceac..dc4cb052de0 100644 --- a/app/livechat/server/methods/addManager.js +++ b/app/livechat/server/methods/addManager.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/changeLivechatStatus.js b/app/livechat/server/methods/changeLivechatStatus.js index b340f6ba7b4..31a302e139b 100644 --- a/app/livechat/server/methods/changeLivechatStatus.js +++ b/app/livechat/server/methods/changeLivechatStatus.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; Meteor.methods({ 'livechat:changeLivechatStatus'() { diff --git a/app/livechat/server/methods/closeByVisitor.js b/app/livechat/server/methods/closeByVisitor.js index 1cc222c06ac..c3829f232b2 100644 --- a/app/livechat/server/methods/closeByVisitor.js +++ b/app/livechat/server/methods/closeByVisitor.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { Rooms, LivechatVisitors } from '/app/models'; +import { settings } from '../../../settings'; +import { Rooms, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/closeRoom.js b/app/livechat/server/methods/closeRoom.js index 6f920ff7b3a..7d49719a046 100644 --- a/app/livechat/server/methods/closeRoom.js +++ b/app/livechat/server/methods/closeRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions, Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Subscriptions, Rooms } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/facebook.js b/app/livechat/server/methods/facebook.js index 13bdd1c8f8d..075165f3bf7 100644 --- a/app/livechat/server/methods/facebook.js +++ b/app/livechat/server/methods/facebook.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; import OmniChannel from '../lib/OmniChannel'; Meteor.methods({ diff --git a/app/livechat/server/methods/getAgentData.js b/app/livechat/server/methods/getAgentData.js index f855a7cf258..77bdf81adbd 100644 --- a/app/livechat/server/methods/getAgentData.js +++ b/app/livechat/server/methods/getAgentData.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Users, Rooms, LivechatVisitors } from '/app/models'; +import { Users, Rooms, LivechatVisitors } from '../../../models'; Meteor.methods({ 'livechat:getAgentData'({ roomId, token }) { diff --git a/app/livechat/server/methods/getAgentOverviewData.js b/app/livechat/server/methods/getAgentOverviewData.js index 1c7cb724542..e6c325a9195 100644 --- a/app/livechat/server/methods/getAgentOverviewData.js +++ b/app/livechat/server/methods/getAgentOverviewData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/getAnalyticsChartData.js b/app/livechat/server/methods/getAnalyticsChartData.js index beb3c45607d..918ff200d1a 100644 --- a/app/livechat/server/methods/getAnalyticsChartData.js +++ b/app/livechat/server/methods/getAnalyticsChartData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/getAnalyticsOverviewData.js b/app/livechat/server/methods/getAnalyticsOverviewData.js index c08094ce913..0958c808501 100644 --- a/app/livechat/server/methods/getAnalyticsOverviewData.js +++ b/app/livechat/server/methods/getAnalyticsOverviewData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/getCustomFields.js b/app/livechat/server/methods/getCustomFields.js index d8baed36cd1..8d202052048 100644 --- a/app/livechat/server/methods/getCustomFields.js +++ b/app/livechat/server/methods/getCustomFields.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { LivechatCustomField } from '/app/models'; +import { LivechatCustomField } from '../../../models'; Meteor.methods({ 'livechat:getCustomFields'() { diff --git a/app/livechat/server/methods/getInitialData.js b/app/livechat/server/methods/getInitialData.js index 2d14d711eaa..119e3c71c31 100644 --- a/app/livechat/server/methods/getInitialData.js +++ b/app/livechat/server/methods/getInitialData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Users, LivechatDepartment, LivechatTrigger, LivechatVisitors } from '/app/models'; +import { Rooms, Users, LivechatDepartment, LivechatTrigger, LivechatVisitors } from '../../../models'; import _ from 'underscore'; import { Livechat } from '../lib/Livechat'; diff --git a/app/livechat/server/methods/getNextAgent.js b/app/livechat/server/methods/getNextAgent.js index 1b0a0d4a1f1..6946c01d003 100644 --- a/app/livechat/server/methods/getNextAgent.js +++ b/app/livechat/server/methods/getNextAgent.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms, Users } from '/app/models'; +import { Rooms, Users } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/loadHistory.js b/app/livechat/server/methods/loadHistory.js index a09be1e824c..060a5c6b549 100644 --- a/app/livechat/server/methods/loadHistory.js +++ b/app/livechat/server/methods/loadHistory.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { loadMessageHistory } from '/app/lib'; -import { LivechatVisitors } from '/app/models'; +import { loadMessageHistory } from '../../../lib'; +import { LivechatVisitors } from '../../../models'; Meteor.methods({ 'livechat:loadHistory'({ token, rid, end, limit = 20, ls }) { diff --git a/app/livechat/server/methods/loginByToken.js b/app/livechat/server/methods/loginByToken.js index b59386e2271..18bbad251dd 100644 --- a/app/livechat/server/methods/loginByToken.js +++ b/app/livechat/server/methods/loginByToken.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { LivechatVisitors } from '/app/models'; +import { LivechatVisitors } from '../../../models'; Meteor.methods({ 'livechat:loginByToken'(token) { diff --git a/app/livechat/server/methods/registerGuest.js b/app/livechat/server/methods/registerGuest.js index def8fd72d33..46995a54931 100644 --- a/app/livechat/server/methods/registerGuest.js +++ b/app/livechat/server/methods/registerGuest.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Rooms, LivechatVisitors } from '/app/models'; +import { Messages, Rooms, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/removeAgent.js b/app/livechat/server/methods/removeAgent.js index 7e2158f5662..e6bc9fcf0cc 100644 --- a/app/livechat/server/methods/removeAgent.js +++ b/app/livechat/server/methods/removeAgent.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/removeCustomField.js b/app/livechat/server/methods/removeCustomField.js index fc8e1800436..a53efa59ee0 100644 --- a/app/livechat/server/methods/removeCustomField.js +++ b/app/livechat/server/methods/removeCustomField.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { LivechatCustomField } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatCustomField } from '../../../models'; Meteor.methods({ 'livechat:removeCustomField'(_id) { diff --git a/app/livechat/server/methods/removeDepartment.js b/app/livechat/server/methods/removeDepartment.js index 5aa0e2bf9fa..d08fee85340 100644 --- a/app/livechat/server/methods/removeDepartment.js +++ b/app/livechat/server/methods/removeDepartment.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/removeManager.js b/app/livechat/server/methods/removeManager.js index c20cb1b206b..9fa635e7d6b 100644 --- a/app/livechat/server/methods/removeManager.js +++ b/app/livechat/server/methods/removeManager.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/removeRoom.js b/app/livechat/server/methods/removeRoom.js index 79b873ca0a3..13ef3aa62d0 100644 --- a/app/livechat/server/methods/removeRoom.js +++ b/app/livechat/server/methods/removeRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Messages, Subscriptions } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms, Messages, Subscriptions } from '../../../models'; Meteor.methods({ 'livechat:removeRoom'(rid) { diff --git a/app/livechat/server/methods/removeTrigger.js b/app/livechat/server/methods/removeTrigger.js index 963d3890292..164f0f56b4f 100644 --- a/app/livechat/server/methods/removeTrigger.js +++ b/app/livechat/server/methods/removeTrigger.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { LivechatTrigger } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatTrigger } from '../../../models'; Meteor.methods({ 'livechat:removeTrigger'(triggerId) { diff --git a/app/livechat/server/methods/returnAsInquiry.js b/app/livechat/server/methods/returnAsInquiry.js index 90e9f81945b..2a7c5971bb4 100644 --- a/app/livechat/server/methods/returnAsInquiry.js +++ b/app/livechat/server/methods/returnAsInquiry.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/saveAppearance.js b/app/livechat/server/methods/saveAppearance.js index d3f8fc5cf33..18ac479061a 100644 --- a/app/livechat/server/methods/saveAppearance.js +++ b/app/livechat/server/methods/saveAppearance.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { settings as rcSettings } from '/app/settings'; +import { hasPermission } from '../../../authorization'; +import { settings as rcSettings } from '../../../settings'; Meteor.methods({ 'livechat:saveAppearance'(settings) { diff --git a/app/livechat/server/methods/saveCustomField.js b/app/livechat/server/methods/saveCustomField.js index 570e9db5e74..8a41b25e1dc 100644 --- a/app/livechat/server/methods/saveCustomField.js +++ b/app/livechat/server/methods/saveCustomField.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { LivechatCustomField } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatCustomField } from '../../../models'; Meteor.methods({ 'livechat:saveCustomField'(_id, customFieldData) { diff --git a/app/livechat/server/methods/saveDepartment.js b/app/livechat/server/methods/saveDepartment.js index 0cebb620293..067f49592ae 100644 --- a/app/livechat/server/methods/saveDepartment.js +++ b/app/livechat/server/methods/saveDepartment.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/saveInfo.js b/app/livechat/server/methods/saveInfo.js index 816d4c0e8c1..4318fd163c7 100644 --- a/app/livechat/server/methods/saveInfo.js +++ b/app/livechat/server/methods/saveInfo.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; +import { callbacks } from '../../../callbacks'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/saveIntegration.js b/app/livechat/server/methods/saveIntegration.js index 29b8207cbf4..b4097b76e53 100644 --- a/app/livechat/server/methods/saveIntegration.js +++ b/app/livechat/server/methods/saveIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasPermission } from '../../../authorization'; +import { settings } from '../../../settings'; import s from 'underscore.string'; Meteor.methods({ diff --git a/app/livechat/server/methods/saveOfficeHours.js b/app/livechat/server/methods/saveOfficeHours.js index 54df259ebce..87477792907 100644 --- a/app/livechat/server/methods/saveOfficeHours.js +++ b/app/livechat/server/methods/saveOfficeHours.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { LivechatOfficeHour } from '/app/models'; +import { LivechatOfficeHour } from '../../../models'; Meteor.methods({ 'livechat:saveOfficeHours'(day, start, finish, open) { diff --git a/app/livechat/server/methods/saveSurveyFeedback.js b/app/livechat/server/methods/saveSurveyFeedback.js index a1968390051..5b5a571178d 100644 --- a/app/livechat/server/methods/saveSurveyFeedback.js +++ b/app/livechat/server/methods/saveSurveyFeedback.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Rooms, LivechatVisitors } from '/app/models'; +import { Rooms, LivechatVisitors } from '../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/livechat/server/methods/saveTrigger.js b/app/livechat/server/methods/saveTrigger.js index ae9fbb35d8b..8452a42ea9d 100644 --- a/app/livechat/server/methods/saveTrigger.js +++ b/app/livechat/server/methods/saveTrigger.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { LivechatTrigger } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatTrigger } from '../../../models'; Meteor.methods({ 'livechat:saveTrigger'(trigger) { diff --git a/app/livechat/server/methods/searchAgent.js b/app/livechat/server/methods/searchAgent.js index e8b639ee26f..18607f7110a 100644 --- a/app/livechat/server/methods/searchAgent.js +++ b/app/livechat/server/methods/searchAgent.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Users } from '../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/livechat/server/methods/sendFileLivechatMessage.js b/app/livechat/server/methods/sendFileLivechatMessage.js index 71c0b007d1c..9095d2971b4 100644 --- a/app/livechat/server/methods/sendFileLivechatMessage.js +++ b/app/livechat/server/methods/sendFileLivechatMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Random } from 'meteor/random'; -import { Rooms, LivechatVisitors } from '/app/models'; -import { FileUpload } from '/app/file-upload'; +import { Rooms, LivechatVisitors } from '../../../models'; +import { FileUpload } from '../../../file-upload'; Meteor.methods({ async 'sendFileLivechatMessage'(roomId, visitorToken, file, msgData = {}) { diff --git a/app/livechat/server/methods/sendMessageLivechat.js b/app/livechat/server/methods/sendMessageLivechat.js index 5dca00759c5..e3b7e7b5672 100644 --- a/app/livechat/server/methods/sendMessageLivechat.js +++ b/app/livechat/server/methods/sendMessageLivechat.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { LivechatVisitors } from '/app/models'; +import { LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/setCustomField.js b/app/livechat/server/methods/setCustomField.js index 16a1a26bdf9..1e840732e3c 100644 --- a/app/livechat/server/methods/setCustomField.js +++ b/app/livechat/server/methods/setCustomField.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, LivechatVisitors, LivechatCustomField } from '/app/models'; +import { Rooms, LivechatVisitors, LivechatCustomField } from '../../../models'; Meteor.methods({ 'livechat:setCustomField'(token, key, value, overwrite = true) { diff --git a/app/livechat/server/methods/setDepartmentForVisitor.js b/app/livechat/server/methods/setDepartmentForVisitor.js index ae6c213f219..3ba3690b431 100644 --- a/app/livechat/server/methods/setDepartmentForVisitor.js +++ b/app/livechat/server/methods/setDepartmentForVisitor.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms, Messages, LivechatVisitors } from '/app/models'; +import { Rooms, Messages, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/startFileUploadRoom.js b/app/livechat/server/methods/startFileUploadRoom.js index d84de9ced41..6d70dbf1584 100644 --- a/app/livechat/server/methods/startFileUploadRoom.js +++ b/app/livechat/server/methods/startFileUploadRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { LivechatVisitors } from '/app/models'; +import { LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/startVideoCall.js b/app/livechat/server/methods/startVideoCall.js index 14fbd117695..45c636ce912 100644 --- a/app/livechat/server/methods/startVideoCall.js +++ b/app/livechat/server/methods/startVideoCall.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; +import { Messages } from '../../../models'; +import { settings } from '../../../settings'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/takeInquiry.js b/app/livechat/server/methods/takeInquiry.js index fec4fc3dae5..0ad662b1a87 100644 --- a/app/livechat/server/methods/takeInquiry.js +++ b/app/livechat/server/methods/takeInquiry.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users, Rooms, Subscriptions, Messages } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Users, Rooms, Subscriptions, Messages } from '../../../models'; import { LivechatInquiry } from '../../lib/LivechatInquiry'; import { Livechat } from '../lib/Livechat'; diff --git a/app/livechat/server/methods/transfer.js b/app/livechat/server/methods/transfer.js index 6e8d819783e..1b08e5a6406 100644 --- a/app/livechat/server/methods/transfer.js +++ b/app/livechat/server/methods/transfer.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission, hasRole } from '/app/authorization'; -import { Rooms, Subscriptions, LivechatVisitors } from '/app/models'; +import { hasPermission, hasRole } from '../../../authorization'; +import { Rooms, Subscriptions, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ diff --git a/app/livechat/server/methods/webhookTest.js b/app/livechat/server/methods/webhookTest.js index 0f2c24258e6..7f88b722c92 100644 --- a/app/livechat/server/methods/webhookTest.js +++ b/app/livechat/server/methods/webhookTest.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { HTTP } from 'meteor/http'; const postCatchError = Meteor.wrapAsync(function(url, options, resolve) { diff --git a/app/livechat/server/permissions.js b/app/livechat/server/permissions.js index 528508cba8e..d8e9153549d 100644 --- a/app/livechat/server/permissions.js +++ b/app/livechat/server/permissions.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Roles, Permissions } from '/app/models'; +import { Roles, Permissions } from '../../models'; import _ from 'underscore'; Meteor.startup(() => { diff --git a/app/livechat/server/publications/customFields.js b/app/livechat/server/publications/customFields.js index 70ab764252f..95283a4f4f3 100644 --- a/app/livechat/server/publications/customFields.js +++ b/app/livechat/server/publications/customFields.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatCustomField } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatCustomField } from '../../../models'; import s from 'underscore.string'; Meteor.publish('livechat:customFields', function(_id) { diff --git a/app/livechat/server/publications/departmentAgents.js b/app/livechat/server/publications/departmentAgents.js index 3ec7464043e..f55b2b21491 100644 --- a/app/livechat/server/publications/departmentAgents.js +++ b/app/livechat/server/publications/departmentAgents.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatDepartmentAgents } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatDepartmentAgents } from '../../../models'; Meteor.publish('livechat:departmentAgents', function(departmentId) { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatAgents.js b/app/livechat/server/publications/livechatAgents.js index 7d192c1419e..874b35af4e1 100644 --- a/app/livechat/server/publications/livechatAgents.js +++ b/app/livechat/server/publications/livechatAgents.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission, getUsersInRole } from '/app/authorization'; +import { hasPermission, getUsersInRole } from '../../../authorization'; Meteor.publish('livechat:agents', function() { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatAppearance.js b/app/livechat/server/publications/livechatAppearance.js index 7088af4d5e2..1d304d1696b 100644 --- a/app/livechat/server/publications/livechatAppearance.js +++ b/app/livechat/server/publications/livechatAppearance.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Settings } from '../../../models'; Meteor.publish('livechat:appearance', function() { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatDepartments.js b/app/livechat/server/publications/livechatDepartments.js index 6fb57d6ac8a..c89de01ce74 100644 --- a/app/livechat/server/publications/livechatDepartments.js +++ b/app/livechat/server/publications/livechatDepartments.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatDepartment } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatDepartment } from '../../../models'; Meteor.publish('livechat:departments', function(_id) { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatInquiries.js b/app/livechat/server/publications/livechatInquiries.js index d854dcb3dd8..f94f3478e5a 100644 --- a/app/livechat/server/publications/livechatInquiries.js +++ b/app/livechat/server/publications/livechatInquiries.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; import { LivechatInquiry } from '../../lib/LivechatInquiry'; Meteor.publish('livechat:inquiry', function() { diff --git a/app/livechat/server/publications/livechatIntegration.js b/app/livechat/server/publications/livechatIntegration.js index af14d2dc87a..d9d80fd3caf 100644 --- a/app/livechat/server/publications/livechatIntegration.js +++ b/app/livechat/server/publications/livechatIntegration.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Settings } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Settings } from '../../../models'; Meteor.publish('livechat:integration', function() { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatManagers.js b/app/livechat/server/publications/livechatManagers.js index d45c06b85d6..eefcf21f1d5 100644 --- a/app/livechat/server/publications/livechatManagers.js +++ b/app/livechat/server/publications/livechatManagers.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission, getUsersInRole } from '/app/authorization'; +import { hasPermission, getUsersInRole } from '../../../authorization'; Meteor.publish('livechat:managers', function() { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatMonitoring.js b/app/livechat/server/publications/livechatMonitoring.js index b37e1f4fc72..7257184e4fb 100644 --- a/app/livechat/server/publications/livechatMonitoring.js +++ b/app/livechat/server/publications/livechatMonitoring.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; Meteor.publish('livechat:monitoring', function(date) { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatOfficeHours.js b/app/livechat/server/publications/livechatOfficeHours.js index b890980a24b..6962b7898d4 100644 --- a/app/livechat/server/publications/livechatOfficeHours.js +++ b/app/livechat/server/publications/livechatOfficeHours.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatOfficeHour } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatOfficeHour } from '../../../models'; Meteor.publish('livechat:officeHour', function() { if (!hasPermission(this.userId, 'view-l-room')) { diff --git a/app/livechat/server/publications/livechatQueue.js b/app/livechat/server/publications/livechatQueue.js index 5a10d7c2e0c..2940473890c 100644 --- a/app/livechat/server/publications/livechatQueue.js +++ b/app/livechat/server/publications/livechatQueue.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatDepartmentAgents } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatDepartmentAgents } from '../../../models'; Meteor.publish('livechat:queue', function() { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatRooms.js b/app/livechat/server/publications/livechatRooms.js index 478fea8e348..37eaebf30f3 100644 --- a/app/livechat/server/publications/livechatRooms.js +++ b/app/livechat/server/publications/livechatRooms.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; Meteor.publish('livechat:rooms', function(filter = {}, offset = 0, limit = 20) { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatTriggers.js b/app/livechat/server/publications/livechatTriggers.js index cdc1eb7e2ec..185dd444d2c 100644 --- a/app/livechat/server/publications/livechatTriggers.js +++ b/app/livechat/server/publications/livechatTriggers.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { LivechatTrigger } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatTrigger } from '../../../models'; Meteor.publish('livechat:triggers', function(_id) { if (!this.userId) { diff --git a/app/livechat/server/publications/livechatVisitors.js b/app/livechat/server/publications/livechatVisitors.js index 880239f4fbb..5521d96a32f 100644 --- a/app/livechat/server/publications/livechatVisitors.js +++ b/app/livechat/server/publications/livechatVisitors.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { LivechatVisitors } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { LivechatVisitors } from '../../../models'; Meteor.publish('livechat:visitors', function(date) { if (!this.userId) { diff --git a/app/livechat/server/publications/visitorHistory.js b/app/livechat/server/publications/visitorHistory.js index 7799acdc05c..2309a169792 100644 --- a/app/livechat/server/publications/visitorHistory.js +++ b/app/livechat/server/publications/visitorHistory.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Subscriptions } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms, Subscriptions } from '../../../models'; Meteor.publish('livechat:visitorHistory', function({ rid: roomId }) { if (!this.userId) { diff --git a/app/livechat/server/publications/visitorInfo.js b/app/livechat/server/publications/visitorInfo.js index 3e0736bdf22..054eb358d47 100644 --- a/app/livechat/server/publications/visitorInfo.js +++ b/app/livechat/server/publications/visitorInfo.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms, LivechatVisitors } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms, LivechatVisitors } from '../../../models'; Meteor.publish('livechat:visitorInfo', function({ rid: roomId }) { if (!this.userId) { diff --git a/app/livechat/server/publications/visitorPageVisited.js b/app/livechat/server/publications/visitorPageVisited.js index 11c038c03cd..ae875b6f8f3 100644 --- a/app/livechat/server/publications/visitorPageVisited.js +++ b/app/livechat/server/publications/visitorPageVisited.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Messages } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms, Messages } from '../../../models'; Meteor.publish('livechat:visitorPageVisited', function({ rid: roomId }) { diff --git a/app/livechat/server/roomType.js b/app/livechat/server/roomType.js index 10aeabc7607..be22a6cc694 100644 --- a/app/livechat/server/roomType.js +++ b/app/livechat/server/roomType.js @@ -1,7 +1,7 @@ -import { Rooms } from '/app/models'; -import { roomTypes } from '/app/utils'; +import { Rooms } from '../../models'; +import { roomTypes } from '../../utils'; import LivechatRoomType from '../lib/LivechatRoomType'; -import { LivechatVisitors } from '/app/models'; +import { LivechatVisitors } from '../../models'; class LivechatRoomTypeServer extends LivechatRoomType { getMsgSender(senderId) { diff --git a/app/livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js index c5846ab3d9b..551c2263cde 100644 --- a/app/livechat/server/sendMessageBySMS.js +++ b/app/livechat/server/sendMessageBySMS.js @@ -1,7 +1,7 @@ -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { SMS } from '/app/sms'; -import { LivechatVisitors } from '/app/models'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; +import { SMS } from '../../sms'; +import { LivechatVisitors } from '../../models'; callbacks.add('afterSaveMessage', function(message, room) { // skips this callback if the message was edited diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js index c10d02f5564..318a5051964 100644 --- a/app/livechat/server/startup.js +++ b/app/livechat/server/startup.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { roomTypes } from '/app/utils'; -import { Rooms } from '/app/models'; -import { hasPermission, addRoomAccessValidator } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; +import { roomTypes } from '../../utils'; +import { Rooms } from '../../models'; +import { hasPermission, addRoomAccessValidator } from '../../authorization'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; Meteor.startup(() => { roomTypes.setRoomFind('l', (_id) => Rooms.findLivechatById(_id).fetch()); diff --git a/app/livechat/server/unclosedLivechats.js b/app/livechat/server/unclosedLivechats.js index 38752dfba80..5c06a018f3e 100644 --- a/app/livechat/server/unclosedLivechats.js +++ b/app/livechat/server/unclosedLivechats.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; +import { settings } from '../../settings'; +import { Users } from '../../models'; import { UserPresenceMonitor } from 'meteor/konecty:user-presence'; import { Livechat } from './lib/Livechat'; diff --git a/app/livestream/client/oauth.js b/app/livestream/client/oauth.js index 47661d4ceae..2d840eee6c3 100644 --- a/app/livestream/client/oauth.js +++ b/app/livestream/client/oauth.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; export const close = (popup) => new Promise(function(resolve) { const checkInterval = setInterval(() => { diff --git a/app/livestream/client/tabBar.js b/app/livestream/client/tabBar.js index 473a880747c..640a7ecde7b 100644 --- a/app/livestream/client/tabBar.js +++ b/app/livestream/client/tabBar.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; -import { TabBar } from '/app/ui-utils'; -import { Rooms } from '/app/models'; -import { settings } from '/app/settings'; +import { TabBar } from '../../ui-utils'; +import { Rooms } from '../../models'; +import { settings } from '../../settings'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/app/livestream/client/views/broadcastView.js b/app/livestream/client/views/broadcastView.js index 70c8797f768..7010dea788d 100644 --- a/app/livestream/client/views/broadcastView.js +++ b/app/livestream/client/views/broadcastView.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { handleError } from '/app/utils'; -import { settings } from '/app/settings'; +import { handleError } from '../../../utils'; +import { settings } from '../../../settings'; const getMedia = () => navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia; const createAndConnect = (url) => { diff --git a/app/livestream/client/views/liveStreamTab.js b/app/livestream/client/views/liveStreamTab.js index 3b54c77c4a5..0bb608f54cf 100644 --- a/app/livestream/client/views/liveStreamTab.js +++ b/app/livestream/client/views/liveStreamTab.js @@ -6,13 +6,13 @@ import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import toastr from 'toastr'; import { auth } from '../oauth.js'; -import { RocketChatAnnouncement } from '/app/lib'; -import { popout } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { hasAllPermission } from '/app/authorization'; -import { Users, Rooms } from '/app/models'; +import { RocketChatAnnouncement } from '../../../lib'; +import { popout } from '../../../ui-utils'; +import { t, handleError } from '../../../utils'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { hasAllPermission } from '../../../authorization'; +import { Users, Rooms } from '../../../models'; export const call = (...args) => new Promise(function(resolve, reject) { Meteor.call(...args, function(err, result) { diff --git a/app/livestream/server/methods.js b/app/livestream/server/methods.js index 1d31aab94ce..ae8e6e62b25 100644 --- a/app/livestream/server/methods.js +++ b/app/livestream/server/methods.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Rooms } from '/app/models'; +import { settings } from '../../settings'; +import { Rooms } from '../../models'; import { createLiveStream, statusLiveStream, statusStreamLiveStream, getBroadcastStatus, setBroadcastStatus } from './functions/livestream'; const selectLivestreamSettings = (user) => user && user.settings && user.settings.livestream; diff --git a/app/livestream/server/routes.js b/app/livestream/server/routes.js index db4bfac26a5..cc860cd019f 100644 --- a/app/livestream/server/routes.js +++ b/app/livestream/server/routes.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { API } from '/app/api'; +import { settings } from '../../settings'; +import { Users } from '../../models'; +import { API } from '../../api'; import google from 'googleapis'; const { OAuth2 } = google.auth; diff --git a/app/livestream/server/settings.js b/app/livestream/server/settings.js index 149b94c673e..149cd418085 100644 --- a/app/livestream/server/settings.js +++ b/app/livestream/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('LiveStream & Broadcasting', function() { diff --git a/app/logger/client/viewLogs.js b/app/logger/client/viewLogs.js index ae8bbc865e7..8185bf6a6f0 100644 --- a/app/logger/client/viewLogs.js +++ b/app/logger/client/viewLogs.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { AdminBox } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; -import { t } from '/app/utils'; +import { AdminBox } from '../../ui-utils'; +import { hasAllPermission } from '../../authorization'; +import { t } from '../../utils'; export const stdout = new Mongo.Collection('stdout'); diff --git a/app/logger/client/views/viewLogs.js b/app/logger/client/views/viewLogs.js index f5b97d634b2..6f9e48ff64f 100644 --- a/app/logger/client/views/viewLogs.js +++ b/app/logger/client/views/viewLogs.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { ansispan } from '../ansispan'; import { stdout } from '../viewLogs'; -import { readMessage } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { readMessage } from '../../../ui-utils'; +import { hasAllPermission } from '../../../authorization'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/logger/server/server.js b/app/logger/server/server.js index cb87ed132dd..d7750a2d606 100644 --- a/app/logger/server/server.js +++ b/app/logger/server/server.js @@ -3,8 +3,8 @@ import { Random } from 'meteor/random'; import { EJSON } from 'meteor/ejson'; import { Log } from 'meteor/logging'; import { EventEmitter } from 'events'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; +import { settings } from '../../settings'; +import { hasPermission } from '../../authorization'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/mail-messages/client/startup.js b/app/mail-messages/client/startup.js index f96db361b9c..a9b05d05ad9 100644 --- a/app/mail-messages/client/startup.js +++ b/app/mail-messages/client/startup.js @@ -1,5 +1,5 @@ -import { AdminBox } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { AdminBox } from '../../ui-utils'; +import { hasAllPermission } from '../../authorization'; AdminBox.addOption({ href: 'mailer', diff --git a/app/mail-messages/client/views/mailer.js b/app/mail-messages/client/views/mailer.js index 23f19780606..6aa6f9ac705 100644 --- a/app/mail-messages/client/views/mailer.js +++ b/app/mail-messages/client/views/mailer.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { handleError } from '/app/utils'; +import { settings } from '../../../settings'; +import { handleError } from '../../../utils'; import toastr from 'toastr'; Template.mailer.helpers({ diff --git a/app/mail-messages/server/functions/sendMail.js b/app/mail-messages/server/functions/sendMail.js index 339cf58093d..5e1db39d6d0 100644 --- a/app/mail-messages/server/functions/sendMail.js +++ b/app/mail-messages/server/functions/sendMail.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { EJSON } from 'meteor/ejson'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { placeholders } from '/app/utils'; +import { placeholders } from '../../../utils'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; +import * as Mailer from '../../../mailer'; export const sendMail = function(from, subject, body, dryrun, query) { Mailer.checkAddressFormatAndThrow(from, 'Mailer.sendMail'); diff --git a/app/mail-messages/server/functions/unsubscribe.js b/app/mail-messages/server/functions/unsubscribe.js index 60dd214f0d9..9d892acb0c5 100644 --- a/app/mail-messages/server/functions/unsubscribe.js +++ b/app/mail-messages/server/functions/unsubscribe.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../models'; export const unsubscribe = function(_id, createdAt) { if (_id && createdAt) { diff --git a/app/mail-messages/server/methods/sendMail.js b/app/mail-messages/server/methods/sendMail.js index 76ec1d64376..5dcc9b729ae 100644 --- a/app/mail-messages/server/methods/sendMail.js +++ b/app/mail-messages/server/methods/sendMail.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Mailer } from '../lib/Mailer'; -import { hasRole } from '/app/authorization'; +import { hasRole } from '../../../authorization'; Meteor.methods({ 'Mailer.sendMail'(from, subject, body, dryrun, query) { diff --git a/app/mail-messages/server/startup.js b/app/mail-messages/server/startup.js index 3eb200e4ba5..ed0993fcad5 100644 --- a/app/mail-messages/server/startup.js +++ b/app/mail-messages/server/startup.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../models'; Meteor.startup(function() { return Permissions.upsert('access-mailer', { diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js index e50a5f5fb32..c8044be6476 100644 --- a/app/mailer/server/api.js +++ b/app/mailer/server/api.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Email } from 'meteor/email'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import _ from 'underscore'; import s from 'underscore.string'; import juice from 'juice'; diff --git a/app/mapview/client/mapview.js b/app/mapview/client/mapview.js index 601a8aac83c..a1695c1aaac 100644 --- a/app/mapview/client/mapview.js +++ b/app/mapview/client/mapview.js @@ -1,6 +1,6 @@ import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; /* * MapView is a named function that will replace geolocation in messages with a Google Static Map * @param {Object} message - The message object diff --git a/app/mapview/server/settings.js b/app/mapview/server/settings.js index 86cd8b5c738..0fb4ea239ac 100644 --- a/app/mapview/server/settings.js +++ b/app/mapview/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.add('MapView_Enabled', false, { type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description' }); diff --git a/app/markdown/lib/markdown.js b/app/markdown/lib/markdown.js index 057a2944e75..5881a5f1bec 100644 --- a/app/markdown/lib/markdown.js +++ b/app/markdown/lib/markdown.js @@ -5,8 +5,8 @@ import s from 'underscore.string'; import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; import { marked } from './parser/marked/marked.js'; import { original } from './parser/original/original.js'; diff --git a/app/markdown/lib/parser/marked/marked.js b/app/markdown/lib/parser/marked/marked.js index 16c49238cd7..08577708a07 100644 --- a/app/markdown/lib/parser/marked/marked.js +++ b/app/markdown/lib/parser/marked/marked.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import { Random } from 'meteor/random'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/markdown/lib/parser/original/markdown.js b/app/markdown/lib/parser/original/markdown.js index 2ff4ecd8af4..7ac8f4f2064 100644 --- a/app/markdown/lib/parser/original/markdown.js +++ b/app/markdown/lib/parser/original/markdown.js @@ -4,7 +4,7 @@ */ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import s from 'underscore.string'; const parseNotEscaped = function(msg, message) { diff --git a/app/markdown/server/settings.js b/app/markdown/server/settings.js index d2f33a68921..14d16c7e774 100644 --- a/app/markdown/server/settings.js +++ b/app/markdown/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(() => { settings.add('Markdown_Parser', 'original', { diff --git a/app/markdown/tests/client.mocks.js b/app/markdown/tests/client.mocks.js index 19de0fcead5..49776387379 100644 --- a/app/markdown/tests/client.mocks.js +++ b/app/markdown/tests/client.mocks.js @@ -15,7 +15,7 @@ mock('meteor/blaze', { Blaze: {}, }); -mock('/app/settings', { +mock('../../settings', { settings: { get(setting) { switch (setting) { @@ -38,7 +38,7 @@ mock('/app/settings', { }, }); -mock('/app/callbacks', { +mock('../../callbacks', { callbacks: { add() { diff --git a/app/mentions-flextab/client/actionButton.js b/app/mentions-flextab/client/actionButton.js index c8fefb274d6..a9e585d2956 100644 --- a/app/mentions-flextab/client/actionButton.js +++ b/app/mentions-flextab/client/actionButton.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { MessageAction, RoomHistoryManager } from '/app/ui-utils'; +import { MessageAction, RoomHistoryManager } from '../../ui-utils'; Meteor.startup(function() { MessageAction.addButton({ diff --git a/app/mentions-flextab/client/tabBar.js b/app/mentions-flextab/client/tabBar.js index 4954631368a..07bd5de8480 100644 --- a/app/mentions-flextab/client/tabBar.js +++ b/app/mentions-flextab/client/tabBar.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../ui-utils'; Meteor.startup(function() { return TabBar.addButton({ diff --git a/app/mentions-flextab/server/publications/mentionedMessages.js b/app/mentions-flextab/server/publications/mentionedMessages.js index 1f0468ab101..fcf047545e7 100644 --- a/app/mentions-flextab/server/publications/mentionedMessages.js +++ b/app/mentions-flextab/server/publications/mentionedMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Messages } from '/app/models'; +import { Users, Messages } from '../../../models'; Meteor.publish('mentionedMessages', function(rid, limit = 50) { if (!this.userId) { diff --git a/app/mentions/client/client.js b/app/mentions/client/client.js index 3ae84b2ea41..0d54957be17 100644 --- a/app/mentions/client/client.js +++ b/app/mentions/client/client.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; import Mentions from '../lib/Mentions'; const MentionsClient = new Mentions({ diff --git a/app/mentions/server/methods/getUserMentionsByChannel.js b/app/mentions/server/methods/getUserMentionsByChannel.js index 587bbb8f9ed..d648ed811d0 100644 --- a/app/mentions/server/methods/getUserMentionsByChannel.js +++ b/app/mentions/server/methods/getUserMentionsByChannel.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms, Users, Messages } from '/app/models'; +import { Rooms, Users, Messages } from '../../../models'; Meteor.methods({ getUserMentionsByChannel({ roomId, options }) { diff --git a/app/mentions/server/server.js b/app/mentions/server/server.js index 6d54720c866..3012b300379 100644 --- a/app/mentions/server/server.js +++ b/app/mentions/server/server.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; -import { Users, Subscriptions, Rooms } from '/app/models'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { Notifications } from '../../notifications'; +import { Users, Subscriptions, Rooms } from '../../models'; import _ from 'underscore'; import MentionsServer from './Mentions'; diff --git a/app/message-attachments/client/messageAttachment.js b/app/message-attachments/client/messageAttachment.js index 69c027e099b..de2552b48e4 100644 --- a/app/message-attachments/client/messageAttachment.js +++ b/app/message-attachments/client/messageAttachment.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { DateFormat } from '/app/lib'; +import { DateFormat } from '../../lib'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; -import { Users } from '/app/models'; -import { renderMessageBody } from '/app/ui-utils'; +import { getUserPreference } from '../../utils'; +import { Users } from '../../models'; +import { renderMessageBody } from '../../ui-utils'; const colors = { good: '#35AC19', diff --git a/app/message-mark-as-unread/client/actionButton.js b/app/message-mark-as-unread/client/actionButton.js index e66ececca92..88a6c72b1d8 100644 --- a/app/message-mark-as-unread/client/actionButton.js +++ b/app/message-mark-as-unread/client/actionButton.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { RoomManager, MessageAction } from '/app/ui-utils'; -import { handleError } from '/app/utils'; -import { ChatSubscription } from '/app/models'; +import { RoomManager, MessageAction } from '../../ui-utils'; +import { handleError } from '../../utils'; +import { ChatSubscription } from '../../models'; Meteor.startup(() => { MessageAction.addButton({ diff --git a/app/message-mark-as-unread/server/logger.js b/app/message-mark-as-unread/server/logger.js index a611c5276c8..1327ecda6e8 100644 --- a/app/message-mark-as-unread/server/logger.js +++ b/app/message-mark-as-unread/server/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; const logger = new Logger('MessageMarkAsUnread', { sections: { diff --git a/app/message-mark-as-unread/server/unreadMessages.js b/app/message-mark-as-unread/server/unreadMessages.js index 6e6d821bee1..f5f0421f2ba 100644 --- a/app/message-mark-as-unread/server/unreadMessages.js +++ b/app/message-mark-as-unread/server/unreadMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Subscriptions } from '/app/models'; +import { Messages, Subscriptions } from '../../models'; import logger from './logger'; Meteor.methods({ diff --git a/app/message-pin/client/actionButton.js b/app/message-pin/client/actionButton.js index cef78b0768d..fddb91165c5 100644 --- a/app/message-pin/client/actionButton.js +++ b/app/message-pin/client/actionButton.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { RoomHistoryManager, MessageAction } from '/app/ui-utils'; -import { handleError } from '/app/utils'; -import { settings } from '/app/settings'; -import { Subscriptions } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { RoomHistoryManager, MessageAction } from '../../ui-utils'; +import { handleError } from '../../utils'; +import { settings } from '../../settings'; +import { Subscriptions } from '../../models'; +import { hasAtLeastOnePermission } from '../../authorization'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/app/message-pin/client/messageType.js b/app/message-pin/client/messageType.js index cdb36d40179..a178d84f46e 100644 --- a/app/message-pin/client/messageType.js +++ b/app/message-pin/client/messageType.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { MessageTypes } from '/app/ui-utils'; +import { MessageTypes } from '../../ui-utils'; Meteor.startup(function() { MessageTypes.registerType({ diff --git a/app/message-pin/client/pinMessage.js b/app/message-pin/client/pinMessage.js index 533e9567a49..4fe5ead345d 100644 --- a/app/message-pin/client/pinMessage.js +++ b/app/message-pin/client/pinMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { ChatMessage, Subscriptions } from '/app/models'; +import { settings } from '../../settings'; +import { ChatMessage, Subscriptions } from '../../models'; Meteor.methods({ pinMessage(message) { diff --git a/app/message-pin/client/tabBar.js b/app/message-pin/client/tabBar.js index 49aa185b525..11c121f4f15 100644 --- a/app/message-pin/client/tabBar.js +++ b/app/message-pin/client/tabBar.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { TabBar } from '/app/ui-utils'; +import { settings } from '../../settings'; +import { TabBar } from '../../ui-utils'; Meteor.startup(function() { return Tracker.autorun(function() { diff --git a/app/message-pin/server/pinMessage.js b/app/message-pin/server/pinMessage.js index 5608f3cb2c7..36b0668ab65 100644 --- a/app/message-pin/server/pinMessage.js +++ b/app/message-pin/server/pinMessage.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { isTheLastMessage } from '/app/lib'; -import { getAvatarUrlFromUsername } from '/app/utils'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions, Messages, Users, Rooms } from '/app/models'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { isTheLastMessage } from '../../lib'; +import { getAvatarUrlFromUsername } from '../../utils'; +import { hasPermission } from '../../authorization'; +import { Subscriptions, Messages, Users, Rooms } from '../../models'; const recursiveRemove = (msg, deep = 1) => { if (!msg) { diff --git a/app/message-pin/server/publications/pinnedMessages.js b/app/message-pin/server/publications/pinnedMessages.js index 5d20b40138d..8d41d8fe750 100644 --- a/app/message-pin/server/publications/pinnedMessages.js +++ b/app/message-pin/server/publications/pinnedMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Messages } from '/app/models'; +import { Users, Messages } from '../../../models'; Meteor.publish('pinnedMessages', function(rid, limit = 50) { if (!this.userId) { diff --git a/app/message-pin/server/settings.js b/app/message-pin/server/settings.js index a0036211df5..e5ee9ac276a 100644 --- a/app/message-pin/server/settings.js +++ b/app/message-pin/server/settings.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Permissions } from '/app/models'; +import { settings } from '../../settings'; +import { Permissions } from '../../models'; Meteor.startup(function() { settings.add('Message_AllowPinning', true, { diff --git a/app/message-pin/server/startup/indexes.js b/app/message-pin/server/startup/indexes.js index f511f4f3d90..96e78ad44d2 100644 --- a/app/message-pin/server/startup/indexes.js +++ b/app/message-pin/server/startup/indexes.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.startup(function() { return Meteor.defer(function() { diff --git a/app/message-snippet/client/actionButton.js b/app/message-snippet/client/actionButton.js index bdd2a961fbc..fb61e73d3ab 100644 --- a/app/message-snippet/client/actionButton.js +++ b/app/message-snippet/client/actionButton.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { MessageAction, modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; -import { settings } from '/app/settings'; -import { Subscriptions } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { MessageAction, modal } from '../../ui-utils'; +import { t, handleError } from '../../utils'; +import { settings } from '../../settings'; +import { Subscriptions } from '../../models'; +import { hasAtLeastOnePermission } from '../../authorization'; Meteor.startup(function() { MessageAction.addButton({ diff --git a/app/message-snippet/client/messageType.js b/app/message-snippet/client/messageType.js index d108f5f90e5..f96968f1e54 100644 --- a/app/message-snippet/client/messageType.js +++ b/app/message-snippet/client/messageType.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { MessageTypes } from '/app/ui-utils'; +import { MessageTypes } from '../../ui-utils'; import s from 'underscore.string'; Meteor.startup(function() { diff --git a/app/message-snippet/client/page/snippetPage.js b/app/message-snippet/client/page/snippetPage.js index 93bfe2334d7..7c6e7a8ba9a 100644 --- a/app/message-snippet/client/page/snippetPage.js +++ b/app/message-snippet/client/page/snippetPage.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { DateFormat } from '/app/lib'; +import { DateFormat } from '../../../lib'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { Markdown } from '/app/markdown'; +import { settings } from '../../../settings'; +import { Markdown } from '../../../markdown'; import { SnippetedMessages } from '../lib/collections'; import moment from 'moment'; diff --git a/app/message-snippet/client/router.js b/app/message-snippet/client/router.js index 070d94177b7..b982e9e9eb3 100644 --- a/app/message-snippet/client/router.js +++ b/app/message-snippet/client/router.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../ui-utils'; FlowRouter.route('/snippet/:snippetId/:snippetName', { name: 'snippetView', diff --git a/app/message-snippet/client/snippetMessage.js b/app/message-snippet/client/snippetMessage.js index 51cdd5b69c6..c8c75a16c7f 100644 --- a/app/message-snippet/client/snippetMessage.js +++ b/app/message-snippet/client/snippetMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { ChatMessage, Subscriptions } from '/app/models'; +import { settings } from '../../settings'; +import { ChatMessage, Subscriptions } from '../../models'; Meteor.methods({ snippetMessage(message) { diff --git a/app/message-snippet/client/tabBar/tabBar.js b/app/message-snippet/client/tabBar/tabBar.js index 569b62abf12..4a5c4606274 100644 --- a/app/message-snippet/client/tabBar/tabBar.js +++ b/app/message-snippet/client/tabBar/tabBar.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { TabBar } from '/app/ui-utils'; +import { settings } from '../../../settings'; +import { TabBar } from '../../../ui-utils'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/app/message-snippet/server/methods/snippetMessage.js b/app/message-snippet/server/methods/snippetMessage.js index 638909ac535..02426cadfd6 100644 --- a/app/message-snippet/server/methods/snippetMessage.js +++ b/app/message-snippet/server/methods/snippetMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions, Messages, Users, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { isTheLastMessage } from '/app/lib'; +import { Subscriptions, Messages, Users, Rooms } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { isTheLastMessage } from '../../../lib'; Meteor.methods({ snippetMessage(message, filename) { diff --git a/app/message-snippet/server/publications/snippetedMessage.js b/app/message-snippet/server/publications/snippetedMessage.js index 5d67e0f4ad2..6a5fe838cd9 100644 --- a/app/message-snippet/server/publications/snippetedMessage.js +++ b/app/message-snippet/server/publications/snippetedMessage.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Users, Rooms } from '/app/models'; +import { Messages, Users, Rooms } from '../../../models'; Meteor.publish('snippetedMessage', function(_id) { if (typeof this.userId === 'undefined' || this.userId === null) { diff --git a/app/message-snippet/server/publications/snippetedMessagesByRoom.js b/app/message-snippet/server/publications/snippetedMessagesByRoom.js index 58c17e4a5fd..9dd0073c072 100644 --- a/app/message-snippet/server/publications/snippetedMessagesByRoom.js +++ b/app/message-snippet/server/publications/snippetedMessagesByRoom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Messages } from '/app/models'; +import { Users, Messages } from '../../../models'; Meteor.publish('snippetedMessages', function(rid, limit = 50) { if (typeof this.userId === 'undefined' || this.userId === null) { diff --git a/app/message-snippet/server/requests.js b/app/message-snippet/server/requests.js index e37c7e93639..2e404817849 100644 --- a/app/message-snippet/server/requests.js +++ b/app/message-snippet/server/requests.js @@ -1,6 +1,6 @@ import { WebApp } from 'meteor/webapp'; import { Cookies } from 'meteor/ostrio:cookies'; -import { Users, Rooms, Messages } from '/app/models'; +import { Users, Rooms, Messages } from '../../models'; WebApp.connectHandlers.use('/snippet/download', function(req, res) { let rawCookies; diff --git a/app/message-snippet/server/startup/settings.js b/app/message-snippet/server/startup/settings.js index 2090d613340..1293ed4f166 100644 --- a/app/message-snippet/server/startup/settings.js +++ b/app/message-snippet/server/startup/settings.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Permissions } from '/app/models'; +import { settings } from '../../../settings'; +import { Permissions } from '../../../models'; Meteor.startup(function() { settings.add('Message_AllowSnippeting', false, { diff --git a/app/message-star/client/actionButton.js b/app/message-star/client/actionButton.js index ddc1fad4a51..5ea9b8c6720 100644 --- a/app/message-star/client/actionButton.js +++ b/app/message-star/client/actionButton.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { handleError } from '/app/utils'; -import { Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { RoomHistoryManager, MessageAction } from '/app/ui-utils'; +import { handleError } from '../../utils'; +import { Subscriptions } from '../../models'; +import { settings } from '../../settings'; +import { RoomHistoryManager, MessageAction } from '../../ui-utils'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/app/message-star/client/starMessage.js b/app/message-star/client/starMessage.js index d7117787620..04d15d194cb 100644 --- a/app/message-star/client/starMessage.js +++ b/app/message-star/client/starMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { ChatMessage, Subscriptions } from '/app/models'; +import { settings } from '../../settings'; +import { ChatMessage, Subscriptions } from '../../models'; Meteor.methods({ starMessage(message) { diff --git a/app/message-star/client/tabBar.js b/app/message-star/client/tabBar.js index f04040e3838..2e915e48c7d 100644 --- a/app/message-star/client/tabBar.js +++ b/app/message-star/client/tabBar.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../ui-utils'; Meteor.startup(function() { TabBar.addButton({ diff --git a/app/message-star/server/publications/starredMessages.js b/app/message-star/server/publications/starredMessages.js index 959bdb27d1e..9973adbf94c 100644 --- a/app/message-star/server/publications/starredMessages.js +++ b/app/message-star/server/publications/starredMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Messages } from '/app/models'; +import { Users, Messages } from '../../../models'; Meteor.publish('starredMessages', function(rid, limit = 50) { if (!this.userId) { diff --git a/app/message-star/server/settings.js b/app/message-star/server/settings.js index 17dd95a1bfa..05ec4f0f1d6 100644 --- a/app/message-star/server/settings.js +++ b/app/message-star/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { return settings.add('Message_AllowStarring', true, { diff --git a/app/message-star/server/starMessage.js b/app/message-star/server/starMessage.js index 180262a4830..7b063d012d6 100644 --- a/app/message-star/server/starMessage.js +++ b/app/message-star/server/starMessage.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { isTheLastMessage } from '/app/lib'; -import { Subscriptions, Rooms, Messages } from '/app/models'; +import { settings } from '../../settings'; +import { isTheLastMessage } from '../../lib'; +import { Subscriptions, Rooms, Messages } from '../../models'; Meteor.methods({ starMessage(message) { diff --git a/app/message-star/server/startup/indexes.js b/app/message-star/server/startup/indexes.js index 9fa26df41c1..464dbc66180 100644 --- a/app/message-star/server/startup/indexes.js +++ b/app/message-star/server/startup/indexes.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.startup(function() { return Meteor.defer(function() { diff --git a/app/meteor-accounts-saml/server/saml_rocketchat.js b/app/meteor-accounts-saml/server/saml_rocketchat.js index 86531079571..d2c5fe416cc 100644 --- a/app/meteor-accounts-saml/server/saml_rocketchat.js +++ b/app/meteor-accounts-saml/server/saml_rocketchat.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; const logger = new Logger('steffo:meteor-accounts-saml', { methods: { diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js index 06d9b41c050..b34b10cd329 100644 --- a/app/meteor-accounts-saml/server/saml_server.js +++ b/app/meteor-accounts-saml/server/saml_server.js @@ -3,8 +3,8 @@ import { Accounts } from 'meteor/accounts-base'; import { Random } from 'meteor/random'; import { WebApp } from 'meteor/webapp'; import { RoutePolicy } from 'meteor/routepolicy'; -import { CredentialTokens } from '/app/models'; -import { generateUsernameSuggestion } from '/app/lib'; +import { CredentialTokens } from '../../models'; +import { generateUsernameSuggestion } from '../../lib'; import bodyParser from 'body-parser'; import { SAML } from './saml_utils'; import _ from 'underscore'; diff --git a/app/metrics/server/callbacksMetrics.js b/app/metrics/server/callbacksMetrics.js index b36eeb45e92..4d9e2f0d0d2 100644 --- a/app/metrics/server/callbacksMetrics.js +++ b/app/metrics/server/callbacksMetrics.js @@ -1,4 +1,4 @@ -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import { metrics } from './lib/metrics'; import StatsTracker from './lib/statsTracker'; diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js index 73c0386a18f..b0e47550363 100644 --- a/app/metrics/server/lib/metrics.js +++ b/app/metrics/server/lib/metrics.js @@ -3,10 +3,10 @@ import connect from 'connect'; import http from 'http'; import _ from 'underscore'; import { Meteor } from 'meteor/meteor'; -import { Info } from '/app/utils'; -import { Migrations } from '/app/migrations'; -import { settings } from '/app/settings'; -import { Statistics } from '/app/models'; +import { Info } from '../../../utils'; +import { Migrations } from '../../../migrations'; +import { settings } from '../../../settings'; +import { Statistics } from '../../../models'; client.collectDefaultMetrics(); diff --git a/app/migrations/server/migrations.js b/app/migrations/server/migrations.js index 38c299e318f..04cd0eaa949 100644 --- a/app/migrations/server/migrations.js +++ b/app/migrations/server/migrations.js @@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Mongo } from 'meteor/mongo'; import { Log } from 'meteor/logging'; -import { Info } from '/app/utils'; +import { Info } from '../../utils'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/app/models/client/models/CachedChatRoom.js b/app/models/client/models/CachedChatRoom.js index 72830550637..6ed43bc1574 100644 --- a/app/models/client/models/CachedChatRoom.js +++ b/app/models/client/models/CachedChatRoom.js @@ -1,3 +1,3 @@ -import { CachedCollection } from '/app/ui-cached-collection'; +import { CachedCollection } from '../../../ui-cached-collection'; export const CachedChatRoom = new CachedCollection({ name: 'rooms' }); diff --git a/app/models/client/models/CachedChatSubscription.js b/app/models/client/models/CachedChatSubscription.js index a501a93ffd3..a237624ba11 100644 --- a/app/models/client/models/CachedChatSubscription.js +++ b/app/models/client/models/CachedChatSubscription.js @@ -1,3 +1,3 @@ -import { CachedCollection } from '/app/ui-cached-collection'; +import { CachedCollection } from '../../../ui-cached-collection'; export const CachedChatSubscription = new CachedCollection({ name: 'subscriptions' }); diff --git a/app/models/client/models/ChatPermissions.js b/app/models/client/models/ChatPermissions.js index c8099665cfb..e50ce6f66ba 100644 --- a/app/models/client/models/ChatPermissions.js +++ b/app/models/client/models/ChatPermissions.js @@ -1,4 +1,4 @@ -import { CachedCollection } from '/app/ui-cached-collection'; +import { CachedCollection } from '../../../ui-cached-collection'; export const AuthzCachedCollection = new CachedCollection({ name: 'permissions', diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js index 2c9a34ffc0d..0bf8576f53f 100644 --- a/app/models/server/models/Messages.js +++ b/app/models/server/models/Messages.js @@ -33,7 +33,7 @@ export class Messages extends Base { loadSettings() { Meteor.startup(async() => { - const { settings } = await import('/app/settings'); + const { settings } = await import('../../../settings'); this.settings = settings; }); } @@ -912,7 +912,7 @@ export class Messages extends Base { async removeFilesByRoomId(roomId) { if (!this.FileUpload) { - const { FileUpload } = await import('/app/file-upload'); + const { FileUpload } = await import('../../../file-upload'); this.FileUpload = FileUpload; } this.find({ diff --git a/app/models/server/models/Subscriptions.js b/app/models/server/models/Subscriptions.js index cfedc182f98..32a29c9e181 100644 --- a/app/models/server/models/Subscriptions.js +++ b/app/models/server/models/Subscriptions.js @@ -1198,7 +1198,7 @@ export class Subscriptions extends Base { // INSERT async createWithRoomAndUser(room, user, extraData) { if (!this.getDefaultSubscriptionPref) { - const Utils = await import('/app/utils'); + const Utils = await import('../../../utils'); this.getDefaultSubscriptionPref = Utils.getDefaultSubscriptionPref; } const subscription = { diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js index 7e925d521b4..b9dc09c23cb 100644 --- a/app/models/server/models/Users.js +++ b/app/models/server/models/Users.js @@ -22,7 +22,7 @@ export class Users extends Base { loadSettings() { Meteor.startup(async() => { - const { settings } = await import('/app/settings'); + const { settings } = await import('../../../settings'); this.settings = settings; }); } diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js index 2d0a1497e97..69e21f2ba4a 100644 --- a/app/models/server/models/_BaseDb.js +++ b/app/models/server/models/_BaseDb.js @@ -57,7 +57,7 @@ export class BaseDb extends EventEmitter { listenSettings() { Meteor.startup(async() => { - const { settings } = await import('/app/settings'); + const { settings } = await import('../../../settings'); settings.get('Force_Disable_OpLog_For_Cache', (key, value) => { isOplogEnabled = isOplogAvailable && value === false; }); diff --git a/app/notifications/server/lib/Notifications.js b/app/notifications/server/lib/Notifications.js index 68c84090632..ab9ff5d8531 100644 --- a/app/notifications/server/lib/Notifications.js +++ b/app/notifications/server/lib/Notifications.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { DDPCommon } from 'meteor/ddp-common'; -import { Subscriptions, Rooms } from '/app/models'; -import { settings } from '/app/settings'; +import { Subscriptions, Rooms } from '../../../models'; +import { settings } from '../../../settings'; const changedPayload = function(collection, id, fields) { return DDPCommon.stringifyDDP({ diff --git a/app/oauth2-server-config/client/admin/route.js b/app/oauth2-server-config/client/admin/route.js index 74ce8045c0d..229074dfd0a 100644 --- a/app/oauth2-server-config/client/admin/route.js +++ b/app/oauth2-server-config/client/admin/route.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router' ; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { t } from '/app/utils'; +import { t } from '../../../utils'; FlowRouter.route('/admin/oauth-apps', { name: 'admin-oauth-apps', diff --git a/app/oauth2-server-config/client/admin/startup.js b/app/oauth2-server-config/client/admin/startup.js index 2260e3d7d2d..cf3e4fb0866 100644 --- a/app/oauth2-server-config/client/admin/startup.js +++ b/app/oauth2-server-config/client/admin/startup.js @@ -1,5 +1,5 @@ -import { AdminBox } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { AdminBox } from '../../../ui-utils'; +import { hasAllPermission } from '../../../authorization'; AdminBox.addOption({ href: 'admin-oauth-apps', diff --git a/app/oauth2-server-config/client/admin/views/oauthApp.js b/app/oauth2-server-config/client/admin/views/oauthApp.js index e2ff5471f46..243359de09d 100644 --- a/app/oauth2-server-config/client/admin/views/oauthApp.js +++ b/app/oauth2-server-config/client/admin/views/oauthApp.js @@ -3,9 +3,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasAllPermission } from '/app/authorization'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; +import { hasAllPermission } from '../../../../authorization'; +import { modal } from '../../../../ui-utils'; +import { t, handleError } from '../../../../utils'; import { ChatOAuthApps } from '../collection'; import toastr from 'toastr'; diff --git a/app/oauth2-server-config/client/admin/views/oauthApps.js b/app/oauth2-server-config/client/admin/views/oauthApps.js index 8fcb6a6806a..9ef96d5a740 100644 --- a/app/oauth2-server-config/client/admin/views/oauthApps.js +++ b/app/oauth2-server-config/client/admin/views/oauthApps.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { hasAllPermission } from '/app/authorization'; +import { hasAllPermission } from '../../../../authorization'; import { ChatOAuthApps } from '../collection'; import moment from 'moment'; diff --git a/app/oauth2-server-config/server/admin/methods/addOAuthApp.js b/app/oauth2-server-config/server/admin/methods/addOAuthApp.js index c00387bab64..3a3614dbaf1 100644 --- a/app/oauth2-server-config/server/admin/methods/addOAuthApp.js +++ b/app/oauth2-server-config/server/admin/methods/addOAuthApp.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { hasPermission } from '/app/authorization'; -import { Users, OAuthApps } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { Users, OAuthApps } from '../../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js b/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js index bce007b2d41..e08bbfdfb15 100644 --- a/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js +++ b/app/oauth2-server-config/server/admin/methods/deleteOAuthApp.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { OAuthApps } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { OAuthApps } from '../../../../models'; Meteor.methods({ deleteOAuthApp(applicationId) { diff --git a/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js b/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js index 293f04d1644..50292d4bc06 100644 --- a/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js +++ b/app/oauth2-server-config/server/admin/methods/updateOAuthApp.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { OAuthApps, Users } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { OAuthApps, Users } from '../../../../models'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/oauth2-server-config/server/admin/publications/oauthApps.js b/app/oauth2-server-config/server/admin/publications/oauthApps.js index 66119d5f7fb..498155b1e27 100644 --- a/app/oauth2-server-config/server/admin/publications/oauthApps.js +++ b/app/oauth2-server-config/server/admin/publications/oauthApps.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { OAuthApps } from '/app/models'; +import { hasPermission } from '../../../../authorization'; +import { OAuthApps } from '../../../../models'; Meteor.publish('oauthApps', function() { if (!this.userId) { diff --git a/app/oauth2-server-config/server/oauth/default-services.js b/app/oauth2-server-config/server/oauth/default-services.js index 285796572c1..4925ed314ca 100644 --- a/app/oauth2-server-config/server/oauth/default-services.js +++ b/app/oauth2-server-config/server/oauth/default-services.js @@ -1,4 +1,4 @@ -import { OAuthApps } from '/app/models'; +import { OAuthApps } from '../../../models'; if (!OAuthApps.findOne('zapier')) { OAuthApps.insert({ diff --git a/app/oauth2-server-config/server/oauth/oauth2-server.js b/app/oauth2-server-config/server/oauth/oauth2-server.js index c95dc887c52..fbc6fed4e63 100644 --- a/app/oauth2-server-config/server/oauth/oauth2-server.js +++ b/app/oauth2-server-config/server/oauth/oauth2-server.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; -import { OAuthApps, Users } from '/app/models'; +import { OAuthApps, Users } from '../../../models'; import { OAuth2Server } from 'meteor/rocketchat:oauth2-server'; -import { API } from '/app/api'; +import { API } from '../../../api'; const oauth2server = new OAuth2Server({ accessTokensCollectionName: 'rocketchat_oauth_access_tokens', diff --git a/app/oembed/client/oembedAudioWidget.js b/app/oembed/client/oembedAudioWidget.js index d0ca4b109bc..f1eae8cada3 100644 --- a/app/oembed/client/oembedAudioWidget.js +++ b/app/oembed/client/oembedAudioWidget.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; Template.oembedAudioWidget.helpers({ collapsed() { diff --git a/app/oembed/client/oembedFrameWidget.js b/app/oembed/client/oembedFrameWidget.js index d040aaccc39..dee89ca5ef8 100644 --- a/app/oembed/client/oembedFrameWidget.js +++ b/app/oembed/client/oembedFrameWidget.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; Template.oembedFrameWidget.helpers({ collapsed() { diff --git a/app/oembed/client/oembedImageWidget.js b/app/oembed/client/oembedImageWidget.js index b629d409997..fc7dcdd1d20 100644 --- a/app/oembed/client/oembedImageWidget.js +++ b/app/oembed/client/oembedImageWidget.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; Template.oembedImageWidget.helpers({ loadImage() { diff --git a/app/oembed/client/oembedUrlWidget.js b/app/oembed/client/oembedUrlWidget.js index f3aa6175bd8..943d33b44a3 100644 --- a/app/oembed/client/oembedUrlWidget.js +++ b/app/oembed/client/oembedUrlWidget.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; import _ from 'underscore'; const getTitle = function(self) { diff --git a/app/oembed/client/oembedVideoWidget.js b/app/oembed/client/oembedVideoWidget.js index fa8dae1df48..be7764b4510 100644 --- a/app/oembed/client/oembedVideoWidget.js +++ b/app/oembed/client/oembedVideoWidget.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; const getTitle = function(self) { if (self.meta == null) { diff --git a/app/oembed/client/oembedYoutubeWidget.js b/app/oembed/client/oembedYoutubeWidget.js index bf0752d23b6..2e8d2557c62 100644 --- a/app/oembed/client/oembedYoutubeWidget.js +++ b/app/oembed/client/oembedYoutubeWidget.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { getUserPreference } from '/app/utils'; +import { getUserPreference } from '../../utils'; Template.oembedYoutubeWidget.helpers({ collapsed() { diff --git a/app/oembed/server/jumpToMessage.js b/app/oembed/server/jumpToMessage.js index b88c7167947..5b6041047f3 100644 --- a/app/oembed/server/jumpToMessage.js +++ b/app/oembed/server/jumpToMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { getAvatarUrlFromUsername } from '/app/utils'; +import { Messages } from '../../models'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { getAvatarUrlFromUsername } from '../../utils'; import _ from 'underscore'; import URL from 'url'; import QueryString from 'querystring'; diff --git a/app/oembed/server/providers.js b/app/oembed/server/providers.js index 4c98c5302f7..b5cacfd5305 100644 --- a/app/oembed/server/providers.js +++ b/app/oembed/server/providers.js @@ -1,5 +1,5 @@ import { changeCase } from 'meteor/konecty:change-case'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import _ from 'underscore'; import URL from 'url'; import QueryString from 'querystring'; diff --git a/app/oembed/server/server.js b/app/oembed/server/server.js index db9b372c01e..eb08cdca4ee 100644 --- a/app/oembed/server/server.js +++ b/app/oembed/server/server.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { HTTPInternals } from 'meteor/http'; import { changeCase } from 'meteor/konecty:change-case'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { OEmbedCache, Messages } from '/app/models'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { OEmbedCache, Messages } from '../../models'; import _ from 'underscore'; import URL from 'url'; import querystring from 'querystring'; diff --git a/app/otr/client/rocketchat.otr.js b/app/otr/client/rocketchat.otr.js index f9b87b30ae7..b6f3f0efefd 100644 --- a/app/otr/client/rocketchat.otr.js +++ b/app/otr/client/rocketchat.otr.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; -import { Subscriptions } from '/app/models'; -import { promises } from '/app/promises'; -import { Notifications } from '/app/notifications'; -import { t } from '/app/utils'; +import { Subscriptions } from '../../models'; +import { promises } from '../../promises'; +import { Notifications } from '../../notifications'; +import { t } from '../../utils'; class OTRClass { constructor() { diff --git a/app/otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js index 30be7b37b18..4383f1deb3a 100644 --- a/app/otr/client/rocketchat.otr.room.js +++ b/app/otr/client/rocketchat.otr.room.js @@ -6,8 +6,8 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { TAPi18n } from 'meteor/tap:i18n'; import { TimeSync } from 'meteor/mizzao:timesync'; -import { Notifications } from '/app/notifications'; -import { modal } from '/app/ui-utils'; +import { Notifications } from '../../notifications'; +import { modal } from '../../ui-utils'; import { OTR } from './rocketchat.otr'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/otr/client/tabBar.js b/app/otr/client/tabBar.js index 394d39212cc..b5fa4bf30c8 100644 --- a/app/otr/client/tabBar.js +++ b/app/otr/client/tabBar.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { TabBar } from '/app/ui-utils'; +import { settings } from '../../settings'; +import { TabBar } from '../../ui-utils'; import { OTR } from './rocketchat.otr'; Meteor.startup(function() { diff --git a/app/otr/client/views/otrFlexTab.js b/app/otr/client/views/otrFlexTab.js index 59be85f3d5d..7117bed07a9 100644 --- a/app/otr/client/views/otrFlexTab.js +++ b/app/otr/client/views/otrFlexTab.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { OTR } from '../rocketchat.otr'; -import { modal } from '/app/ui-utils'; +import { modal } from '../../../ui-utils'; Template.otrFlexTab.helpers({ otrAvailable() { diff --git a/app/otr/server/methods/deleteOldOTRMessages.js b/app/otr/server/methods/deleteOldOTRMessages.js index e6b45ebf3e7..6f560ba0fc0 100644 --- a/app/otr/server/methods/deleteOldOTRMessages.js +++ b/app/otr/server/methods/deleteOldOTRMessages.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions, Messages } from '/app/models'; +import { Subscriptions, Messages } from '../../../models'; Meteor.methods({ deleteOldOTRMessages(roomId) { diff --git a/app/otr/server/methods/updateOTRAck.js b/app/otr/server/methods/updateOTRAck.js index a49cde8660d..fafb36fa3d2 100644 --- a/app/otr/server/methods/updateOTRAck.js +++ b/app/otr/server/methods/updateOTRAck.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.methods({ updateOTRAck(_id, ack) { diff --git a/app/otr/server/settings.js b/app/otr/server/settings.js index cbfcffbaef6..fbecb9c7519 100644 --- a/app/otr/server/settings.js +++ b/app/otr/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('OTR', function() { this.add('OTR_Enable', true, { diff --git a/app/push-notifications/client/tabBar.js b/app/push-notifications/client/tabBar.js index 144417732d4..41e728ac1a9 100644 --- a/app/push-notifications/client/tabBar.js +++ b/app/push-notifications/client/tabBar.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../ui-utils'; Meteor.startup(function() { TabBar.addButton({ diff --git a/app/push-notifications/client/views/pushNotificationsFlexTab.js b/app/push-notifications/client/views/pushNotificationsFlexTab.js index 3fec7a21cba..736bf4d96bf 100644 --- a/app/push-notifications/client/views/pushNotificationsFlexTab.js +++ b/app/push-notifications/client/views/pushNotificationsFlexTab.js @@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { getUserPreference, handleError, t } from '/app/utils'; -import { popover } from '/app/ui-utils'; -import { CustomSounds } from '/app/custom-sounds'; -import { ChatSubscription } from '/app/models'; +import { settings } from '../../../settings'; +import { getUserPreference, handleError, t } from '../../../utils'; +import { popover } from '../../../ui-utils'; +import { CustomSounds } from '../../../custom-sounds'; +import { ChatSubscription } from '../../../models'; const notificationLabels = { all: 'All_messages', diff --git a/app/push-notifications/server/lib/PushNotification.js b/app/push-notifications/server/lib/PushNotification.js index cde7925b991..c8195835ff5 100644 --- a/app/push-notifications/server/lib/PushNotification.js +++ b/app/push-notifications/server/lib/PushNotification.js @@ -1,7 +1,7 @@ import { Push } from 'meteor/rocketchat:push'; -import { settings } from '/app/settings'; -import { metrics } from '/app/metrics'; -import { RocketChatAssets } from '/app/assets'; +import { settings } from '../../../settings'; +import { metrics } from '../../../metrics'; +import { RocketChatAssets } from '../../../assets'; export class PushNotification { getNotificationId(roomId) { diff --git a/app/push-notifications/server/methods/saveNotificationSettings.js b/app/push-notifications/server/methods/saveNotificationSettings.js index 873fca2a6c6..d63d9af941f 100644 --- a/app/push-notifications/server/methods/saveNotificationSettings.js +++ b/app/push-notifications/server/methods/saveNotificationSettings.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; -import { getUserNotificationPreference } from '/app/utils'; +import { Subscriptions } from '../../../models'; +import { getUserNotificationPreference } from '../../../utils'; Meteor.methods({ saveNotificationSettings(roomId, field, value) { diff --git a/app/reactions/client/init.js b/app/reactions/client/init.js index e53e72dc01f..c798994399b 100644 --- a/app/reactions/client/init.js +++ b/app/reactions/client/init.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -import { Rooms, Subscriptions } from '/app/models'; -import { MessageAction } from '/app/ui-utils'; -import { EmojiPicker } from '/app/emoji'; -import { tooltip } from '/app/tooltip'; +import { Rooms, Subscriptions } from '../../models'; +import { MessageAction } from '../../ui-utils'; +import { EmojiPicker } from '../../emoji'; +import { tooltip } from '../../tooltip'; Template.room.events({ 'click .add-reaction, click [data-message-action="reaction-message"]'(event) { diff --git a/app/reactions/client/methods/setReaction.js b/app/reactions/client/methods/setReaction.js index c0aa0264613..e411dcac92f 100644 --- a/app/reactions/client/methods/setReaction.js +++ b/app/reactions/client/methods/setReaction.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Messages, Rooms, Subscriptions, EmojiCustom } from '/app/models'; -import { callbacks } from '/app/callbacks'; -import { emoji } from '/app/emoji'; +import { Messages, Rooms, Subscriptions, EmojiCustom } from '../../../models'; +import { callbacks } from '../../../callbacks'; +import { emoji } from '../../../emoji'; import _ from 'underscore'; Meteor.methods({ diff --git a/app/reactions/server/setReaction.js b/app/reactions/server/setReaction.js index 8e211a965b5..cbe57fe21fd 100644 --- a/app/reactions/server/setReaction.js +++ b/app/reactions/server/setReaction.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Messages, EmojiCustom, Subscriptions, Rooms } from '/app/models'; -import { Notifications } from '/app/notifications'; -import { callbacks } from '/app/callbacks'; -import { emoji } from '/app/emoji'; -import { isTheLastMessage, msgStream } from '/app/lib'; +import { Messages, EmojiCustom, Subscriptions, Rooms } from '../../models'; +import { Notifications } from '../../notifications'; +import { callbacks } from '../../callbacks'; +import { emoji } from '../../emoji'; +import { isTheLastMessage, msgStream } from '../../lib'; import _ from 'underscore'; const removeUserReaction = (message, reaction, username) => { diff --git a/app/retention-policy/server/cronPruneMessages.js b/app/retention-policy/server/cronPruneMessages.js index 4113116d19f..3ed38a12ff8 100644 --- a/app/retention-policy/server/cronPruneMessages.js +++ b/app/retention-policy/server/cronPruneMessages.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Rooms, Settings } from '/app/models'; -import { cleanRoomHistory } from '/app/lib'; +import { settings } from '../../settings'; +import { Rooms, Settings } from '../../models'; +import { cleanRoomHistory } from '../../lib'; import { SyncedCron } from 'meteor/littledata:synced-cron'; let types = []; diff --git a/app/retention-policy/server/startup/settings.js b/app/retention-policy/server/startup/settings.js index a41919a3192..2280709c4a4 100644 --- a/app/retention-policy/server/startup/settings.js +++ b/app/retention-policy/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('RetentionPolicy', function() { diff --git a/app/search/client/provider/result.js b/app/search/client/provider/result.js index e4dd2a62e15..bcdae910402 100644 --- a/app/search/client/provider/result.js +++ b/app/search/client/provider/result.js @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { MessageAction, RoomHistoryManager } from '/app/ui-utils'; +import { MessageAction, RoomHistoryManager } from '../../../ui-utils'; import _ from 'underscore'; Meteor.startup(function() { diff --git a/app/search/server/events/events.js b/app/search/server/events/events.js index f0b4fce54cd..b739b81ddf6 100644 --- a/app/search/server/events/events.js +++ b/app/search/server/events/events.js @@ -1,5 +1,5 @@ -import { callbacks } from '/app/callbacks'; -import { Users, Rooms } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { Users, Rooms } from '../../../models'; import { searchProviderService } from '../service/providerService'; import SearchLogger from '../logger/logger'; diff --git a/app/search/server/logger/logger.js b/app/search/server/logger/logger.js index 5f44af58422..86464e1c6ac 100644 --- a/app/search/server/logger/logger.js +++ b/app/search/server/logger/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../../logger'; const SearchLogger = new Logger('Search Logger', {}); export default SearchLogger; diff --git a/app/search/server/model/provider.js b/app/search/server/model/provider.js index 921f77ee84b..6e8c8716f91 100644 --- a/app/search/server/model/provider.js +++ b/app/search/server/model/provider.js @@ -1,6 +1,6 @@ /* eslint no-unused-vars: [2, { "args": "none" }]*/ import SearchLogger from '../logger/logger'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; /** * Setting Object in order to manage settings loading for providers and admin ui display diff --git a/app/search/server/service/providerService.js b/app/search/server/service/providerService.js index 2299e0035e5..730d0213437 100644 --- a/app/search/server/service/providerService.js +++ b/app/search/server/service/providerService.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import _ from 'underscore'; import { validationService } from '../service/validationService'; import SearchLogger from '../logger/logger'; diff --git a/app/search/server/service/validationService.js b/app/search/server/service/validationService.js index 7486ceb9de3..a872eda5056 100644 --- a/app/search/server/service/validationService.js +++ b/app/search/server/service/validationService.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import SearchLogger from '../logger/logger'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; class ValidationService { constructor() {} diff --git a/app/settings/client/lib/settings.js b/app/settings/client/lib/settings.js index 7978bf71c46..3e49f44a826 100644 --- a/app/settings/client/lib/settings.js +++ b/app/settings/client/lib/settings.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveDict } from 'meteor/reactive-dict'; -import { CachedCollection } from '/app/ui-cached-collection'; +import { CachedCollection } from '../../../ui-cached-collection'; import { settings } from '../../lib/settings'; settings.cachedCollection = new CachedCollection({ diff --git a/app/settings/server/functions/settings.js b/app/settings/server/functions/settings.js index 17ef332d889..a7caf4fe6cc 100644 --- a/app/settings/server/functions/settings.js +++ b/app/settings/server/functions/settings.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { settings } from '../../lib/settings'; -import { Settings } from '/app/models'; +import { Settings } from '../../../models'; import _ from 'underscore'; const blockedSettings = {}; diff --git a/app/setup-wizard/client/final.js b/app/setup-wizard/client/final.js index 1f3c39c7426..a0de3155524 100644 --- a/app/setup-wizard/client/final.js +++ b/app/setup-wizard/client/final.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { hasRole } from '/app/authorization'; +import { settings } from '../../settings'; +import { Users } from '../../models'; +import { hasRole } from '../../authorization'; Template.setupWizardFinal.onCreated(function() { const isSetupWizardDone = localStorage.getItem('wizardFinal'); diff --git a/app/setup-wizard/client/setupWizard.js b/app/setup-wizard/client/setupWizard.js index 70e8f8969d9..16b472cee54 100644 --- a/app/setup-wizard/client/setupWizard.js +++ b/app/setup-wizard/client/setupWizard.js @@ -5,11 +5,11 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { hasRole } from '/app/authorization'; -import { Users } from '/app/models'; -import { t, handleError } from '/app/utils'; +import { settings } from '../../settings'; +import { callbacks } from '../../callbacks'; +import { hasRole } from '../../authorization'; +import { Users } from '../../models'; +import { t, handleError } from '../../utils'; import toastr from 'toastr'; const cannotSetup = () => { diff --git a/app/setup-wizard/server/getSetupWizardParameters.js b/app/setup-wizard/server/getSetupWizardParameters.js index 3b5ffc6a570..9124d6ed16d 100644 --- a/app/setup-wizard/server/getSetupWizardParameters.js +++ b/app/setup-wizard/server/getSetupWizardParameters.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasRole } from '/app/authorization'; -import { Settings } from '/app/models'; +import { hasRole } from '../../authorization'; +import { Settings } from '../../models'; Meteor.methods({ getSetupWizardParameters() { diff --git a/app/slackbridge/client/slackbridge_import.client.js b/app/slackbridge/client/slackbridge_import.client.js index 1add429a007..1441701f92d 100644 --- a/app/slackbridge/client/slackbridge_import.client.js +++ b/app/slackbridge/client/slackbridge_import.client.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { slashCommands } from '/app/utils'; +import { settings } from '../../settings'; +import { slashCommands } from '../../utils'; settings.onload('SlackBridge_Enabled', (key, value) => { if (value) { diff --git a/app/slackbridge/server/RocketAdapter.js b/app/slackbridge/server/RocketAdapter.js index 4bcf7ddb0d3..af629d5efe0 100644 --- a/app/slackbridge/server/RocketAdapter.js +++ b/app/slackbridge/server/RocketAdapter.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { Random } from 'meteor/random'; import { HTTP } from 'meteor/http'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { Messages, Rooms, Users } from '/app/models'; -import { createRoom, sendMessage, setUserAvatar } from '/app/lib'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; +import { Messages, Rooms, Users } from '../../models'; +import { createRoom, sendMessage, setUserAvatar } from '../../lib'; import { logger } from './logger'; import _ from 'underscore'; import util from 'util'; diff --git a/app/slackbridge/server/SlackAdapter.js b/app/slackbridge/server/SlackAdapter.js index d0da759b0e4..9e351623e87 100644 --- a/app/slackbridge/server/SlackAdapter.js +++ b/app/slackbridge/server/SlackAdapter.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { getAvatarUrlFromUsername } from '/app/utils'; -import { Messages, Rooms, Users } from '/app/models'; -import { settings } from '/app/settings'; +import { getAvatarUrlFromUsername } from '../../utils'; +import { Messages, Rooms, Users } from '../../models'; +import { settings } from '../../settings'; import { deleteMessage, updateMessage, @@ -11,9 +11,9 @@ import { archiveRoom, unarchiveRoom, sendMessage, -} from '/app/lib'; -import { saveRoomName, saveRoomTopic } from '/app/channel-settings'; -import { FileUpload } from '/app/file-upload'; +} from '../../lib'; +import { saveRoomName, saveRoomTopic } from '../../channel-settings'; +import { FileUpload } from '../../file-upload'; import { logger } from './logger'; import _ from 'underscore'; import url from 'url'; diff --git a/app/slackbridge/server/logger.js b/app/slackbridge/server/logger.js index 06d5c686d46..f8cf6607839 100644 --- a/app/slackbridge/server/logger.js +++ b/app/slackbridge/server/logger.js @@ -1,4 +1,4 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; export const logger = new Logger('SlackBridge', { sections: { diff --git a/app/slackbridge/server/settings.js b/app/slackbridge/server/settings.js index cd0085b1ef2..4fd7513f331 100644 --- a/app/slackbridge/server/settings.js +++ b/app/slackbridge/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('SlackBridge', function() { diff --git a/app/slackbridge/server/slackbridge.js b/app/slackbridge/server/slackbridge.js index 665938820e9..f8757a1c234 100644 --- a/app/slackbridge/server/slackbridge.js +++ b/app/slackbridge/server/slackbridge.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import SlackAdapter from './SlackAdapter.js'; import RocketAdapter from './RocketAdapter.js'; import { logger } from './logger'; diff --git a/app/slackbridge/server/slackbridge_import.server.js b/app/slackbridge/server/slackbridge_import.server.js index 9911a093b30..dc835e41a40 100644 --- a/app/slackbridge/server/slackbridge_import.server.js +++ b/app/slackbridge/server/slackbridge_import.server.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms } from '/app/models'; -import { msgStream } from '/app/lib'; -import { slashCommands } from '/app/utils'; +import { Rooms } from '../../models'; +import { msgStream } from '../../lib'; +import { slashCommands } from '../../utils'; import { SlackBridge } from './slackbridge'; function SlackBridgeImport(command, params, item) { diff --git a/app/slashcommand-asciiarts/lib/gimme.js b/app/slashcommand-asciiarts/lib/gimme.js index 6b4b8b5837e..1b0ece10ed9 100644 --- a/app/slashcommand-asciiarts/lib/gimme.js +++ b/app/slashcommand-asciiarts/lib/gimme.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; /* * Gimme is a named function that will replace /gimme commands * @param {Object} message - The message object diff --git a/app/slashcommand-asciiarts/lib/lenny.js b/app/slashcommand-asciiarts/lib/lenny.js index a2b4e837266..59f39c8c756 100644 --- a/app/slashcommand-asciiarts/lib/lenny.js +++ b/app/slashcommand-asciiarts/lib/lenny.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; /* * Lenny is a named function that will replace /lenny commands * @param {Object} message - The message object diff --git a/app/slashcommand-asciiarts/lib/shrug.js b/app/slashcommand-asciiarts/lib/shrug.js index cd4165989ad..776f99577e3 100644 --- a/app/slashcommand-asciiarts/lib/shrug.js +++ b/app/slashcommand-asciiarts/lib/shrug.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; /* * Shrug is a named function that will replace /shrug commands * @param {Object} message - The message object diff --git a/app/slashcommand-asciiarts/lib/tableflip.js b/app/slashcommand-asciiarts/lib/tableflip.js index 4f071321a83..fc054e18b58 100644 --- a/app/slashcommand-asciiarts/lib/tableflip.js +++ b/app/slashcommand-asciiarts/lib/tableflip.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; /* * Tableflip is a named function that will replace /Tableflip commands * @param {Object} message - The message object diff --git a/app/slashcommand-asciiarts/lib/unflip.js b/app/slashcommand-asciiarts/lib/unflip.js index bfff8fce710..0cc6c3c47e2 100644 --- a/app/slashcommand-asciiarts/lib/unflip.js +++ b/app/slashcommand-asciiarts/lib/unflip.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; /* * Unflip is a named function that will replace /unflip commands * @param {Object} message - The message object diff --git a/app/slashcommands-archiveroom/client/client.js b/app/slashcommands-archiveroom/client/client.js index 939d0bd4dc3..472ec711b2e 100644 --- a/app/slashcommands-archiveroom/client/client.js +++ b/app/slashcommands-archiveroom/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('archive', null, { description: 'Archive', diff --git a/app/slashcommands-archiveroom/server/server.js b/app/slashcommands-archiveroom/server/server.js index a32501dcff6..f4da898c8db 100644 --- a/app/slashcommands-archiveroom/server/server.js +++ b/app/slashcommands-archiveroom/server/server.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Messages } from '/app/models'; -import { slashCommands } from '/app/utils'; -import { Notifications } from '/app/notifications'; +import { Rooms, Messages } from '../../models'; +import { slashCommands } from '../../utils'; +import { Notifications } from '../../notifications'; function Archive(command, params, item) { if (command !== 'archive' || !Match.test(params, String)) { diff --git a/app/slashcommands-create/client/client.js b/app/slashcommands-create/client/client.js index d47899dcee0..020f7687d48 100644 --- a/app/slashcommands-create/client/client.js +++ b/app/slashcommands-create/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('create', null, { description: 'Create_A_New_Channel', diff --git a/app/slashcommands-create/server/server.js b/app/slashcommands-create/server/server.js index 727d12f2284..a3fb8fe3b71 100644 --- a/app/slashcommands-create/server/server.js +++ b/app/slashcommands-create/server/server.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { Rooms } from '/app/models'; -import { slashCommands } from '/app/utils'; +import { settings } from '../../settings'; +import { Notifications } from '../../notifications'; +import { Rooms } from '../../models'; +import { slashCommands } from '../../utils'; function Create(command, params, item) { function getParams(str) { diff --git a/app/slashcommands-help/server/server.js b/app/slashcommands-help/server/server.js index 034574fb102..a8773215e79 100644 --- a/app/slashcommands-help/server/server.js +++ b/app/slashcommands-help/server/server.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { slashCommands } from '/app/utils'; -import { Notifications } from '/app/notifications'; +import { slashCommands } from '../../utils'; +import { Notifications } from '../../notifications'; /* * Help is a named function that will replace /join commands diff --git a/app/slashcommands-hide/client/hide.js b/app/slashcommands-hide/client/hide.js index 2ddc41e0e7a..a28f9a25c19 100644 --- a/app/slashcommands-hide/client/hide.js +++ b/app/slashcommands-hide/client/hide.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('hide', undefined, { description: 'Hide_room', diff --git a/app/slashcommands-hide/server/hide.js b/app/slashcommands-hide/server/hide.js index baed1c1290c..20940e37dcc 100644 --- a/app/slashcommands-hide/server/hide.js +++ b/app/slashcommands-hide/server/hide.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; -import { slashCommands } from '/app/utils'; +import { Rooms, Subscriptions } from '../../models'; +import { Notifications } from '../../notifications'; +import { slashCommands } from '../../utils'; /* * Hide is a named function that will replace /hide commands diff --git a/app/slashcommands-invite/client/client.js b/app/slashcommands-invite/client/client.js index 2496ac986a2..93665e62c36 100644 --- a/app/slashcommands-invite/client/client.js +++ b/app/slashcommands-invite/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('invite', undefined, { description: 'Invite_user_to_join_channel', diff --git a/app/slashcommands-invite/server/server.js b/app/slashcommands-invite/server/server.js index d955a934a37..ceb56462645 100644 --- a/app/slashcommands-invite/server/server.js +++ b/app/slashcommands-invite/server/server.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Notifications } from '/app/notifications'; -import { slashCommands } from '/app/utils'; -import { Subscriptions } from '/app/models'; +import { Notifications } from '../../notifications'; +import { slashCommands } from '../../utils'; +import { Subscriptions } from '../../models'; /* * Invite is a named function that will replace /invite commands diff --git a/app/slashcommands-inviteall/client/client.js b/app/slashcommands-inviteall/client/client.js index bda0408e537..2626561abad 100644 --- a/app/slashcommands-inviteall/client/client.js +++ b/app/slashcommands-inviteall/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('invite-all-to', undefined, { description: 'Invite_user_to_join_channel_all_to', diff --git a/app/slashcommands-inviteall/server/server.js b/app/slashcommands-inviteall/server/server.js index 03e7af41694..f6e3fa6076b 100644 --- a/app/slashcommands-inviteall/server/server.js +++ b/app/slashcommands-inviteall/server/server.js @@ -6,10 +6,10 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions } from '/app/models'; -import { slashCommands } from '/app/utils'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { Rooms, Subscriptions } from '../../models'; +import { slashCommands } from '../../utils'; +import { settings } from '../../settings'; +import { Notifications } from '../../notifications'; function inviteAll(type) { return function inviteAll(command, params, item) { diff --git a/app/slashcommands-join/client/client.js b/app/slashcommands-join/client/client.js index 5a703c628ff..d1d0ab2971f 100644 --- a/app/slashcommands-join/client/client.js +++ b/app/slashcommands-join/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('join', undefined, { description: 'Join_the_given_channel', diff --git a/app/slashcommands-join/server/server.js b/app/slashcommands-join/server/server.js index 255dfc8d724..fb43c3cb0d3 100644 --- a/app/slashcommands-join/server/server.js +++ b/app/slashcommands-join/server/server.js @@ -7,9 +7,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; -import { slashCommands } from '/app/utils'; +import { Rooms, Subscriptions } from '../../models'; +import { Notifications } from '../../notifications'; +import { slashCommands } from '../../utils'; slashCommands.add('join', function Join(command, params, item) { diff --git a/app/slashcommands-kick/client/client.js b/app/slashcommands-kick/client/client.js index 547c45ccc83..eb0b32c6c60 100644 --- a/app/slashcommands-kick/client/client.js +++ b/app/slashcommands-kick/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('kick', function(command, params) { const username = params.trim(); diff --git a/app/slashcommands-kick/server/server.js b/app/slashcommands-kick/server/server.js index 126d4af61c0..ee73f3bfdee 100644 --- a/app/slashcommands-kick/server/server.js +++ b/app/slashcommands-kick/server/server.js @@ -4,9 +4,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Notifications } from '/app/notifications'; -import { Users, Subscriptions } from '/app/models'; -import { slashCommands } from '/app/utils'; +import { Notifications } from '../../notifications'; +import { Users, Subscriptions } from '../../models'; +import { slashCommands } from '../../utils'; const Kick = function(command, params, { rid }) { if (command !== 'kick' || !Match.test(params, String)) { diff --git a/app/slashcommands-leave/server/leave.js b/app/slashcommands-leave/server/leave.js index c90d42002e2..4e42e13d917 100644 --- a/app/slashcommands-leave/server/leave.js +++ b/app/slashcommands-leave/server/leave.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Notifications } from '/app/notifications'; -import { slashCommands } from '/app/utils'; +import { Notifications } from '../../notifications'; +import { slashCommands } from '../../utils'; /* * Leave is a named function that will replace /leave commands diff --git a/app/slashcommands-me/server/me.js b/app/slashcommands-me/server/me.js index 32415da70ad..15321e8ba0a 100644 --- a/app/slashcommands-me/server/me.js +++ b/app/slashcommands-me/server/me.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; import s from 'underscore.string'; /* diff --git a/app/slashcommands-msg/server/server.js b/app/slashcommands-msg/server/server.js index 7b978ed5a47..eed916392d6 100644 --- a/app/slashcommands-msg/server/server.js +++ b/app/slashcommands-msg/server/server.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { slashCommands } from '/app/utils'; -import { Notifications } from '/app/notifications'; -import { Users } from '/app/models'; +import { slashCommands } from '../../utils'; +import { Notifications } from '../../notifications'; +import { Users } from '../../models'; /* * Msg is a named function that will replace /msg commands diff --git a/app/slashcommands-mute/server/mute.js b/app/slashcommands-mute/server/mute.js index c196622c217..f0ee7fce936 100644 --- a/app/slashcommands-mute/server/mute.js +++ b/app/slashcommands-mute/server/mute.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { slashCommands } from '/app/utils'; -import { Users, Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { slashCommands } from '../../utils'; +import { Users, Subscriptions } from '../../models'; +import { Notifications } from '../../notifications'; /* * Mute is a named function that will replace /mute commands diff --git a/app/slashcommands-mute/server/unmute.js b/app/slashcommands-mute/server/unmute.js index bfbc1a26e15..01d29f2595a 100644 --- a/app/slashcommands-mute/server/unmute.js +++ b/app/slashcommands-mute/server/unmute.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { slashCommands } from '/app/utils'; -import { Users, Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { slashCommands } from '../../utils'; +import { Users, Subscriptions } from '../../models'; +import { Notifications } from '../../notifications'; /* * Unmute is a named function that will replace /unmute commands diff --git a/app/slashcommands-open/client/client.js b/app/slashcommands-open/client/client.js index d643feebd73..a31118ccc60 100644 --- a/app/slashcommands-open/client/client.js +++ b/app/slashcommands-open/client/client.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { slashCommands, roomTypes } from '/app/utils'; -import { ChatSubscription, Subscriptions } from '/app/models'; +import { slashCommands, roomTypes } from '../../utils'; +import { ChatSubscription, Subscriptions } from '../../models'; function Open(command, params /* , item*/) { const dict = { diff --git a/app/slashcommands-topic/lib/topic.js b/app/slashcommands-topic/lib/topic.js index c5fdfe8285e..07a8a941fd2 100644 --- a/app/slashcommands-topic/lib/topic.js +++ b/app/slashcommands-topic/lib/topic.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { handleError, slashCommands } from '/app/utils'; -import { ChatRoom } from '/app/models'; -import { callbacks } from '/app/callbacks'; -import { hasPermission } from '/app/authorization'; +import { handleError, slashCommands } from '../../utils'; +import { ChatRoom } from '../../models'; +import { callbacks } from '../../callbacks'; +import { hasPermission } from '../../authorization'; /* * Join is a named function that will replace /topic commands * @param {Object} message - The message object diff --git a/app/slashcommands-unarchiveroom/client/client.js b/app/slashcommands-unarchiveroom/client/client.js index 40281a34db1..36cbcf83130 100644 --- a/app/slashcommands-unarchiveroom/client/client.js +++ b/app/slashcommands-unarchiveroom/client/client.js @@ -1,4 +1,4 @@ -import { slashCommands } from '/app/utils'; +import { slashCommands } from '../../utils'; slashCommands.add('unarchive', null, { description: 'Unarchive', diff --git a/app/slashcommands-unarchiveroom/server/server.js b/app/slashcommands-unarchiveroom/server/server.js index 5871c6194c6..6ddd880c6c9 100644 --- a/app/slashcommands-unarchiveroom/server/server.js +++ b/app/slashcommands-unarchiveroom/server/server.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Random } from 'meteor/random'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Messages } from '/app/models'; -import { slashCommands } from '/app/utils'; -import { Notifications } from '/app/notifications'; +import { Rooms, Messages } from '../../models'; +import { slashCommands } from '../../utils'; +import { Notifications } from '../../notifications'; function Unarchive(command, params, item) { if (command !== 'unarchive' || !Match.test(params, String)) { diff --git a/app/smarsh-connector/server/functions/generateEml.js b/app/smarsh-connector/server/functions/generateEml.js index 6dc45156822..48f15325501 100644 --- a/app/smarsh-connector/server/functions/generateEml.js +++ b/app/smarsh-connector/server/functions/generateEml.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { Rooms, Messages, Users, SmarshHistory } from '/app/models'; -import { MessageTypes } from '/app/ui-utils'; +import { settings } from '../../../settings'; +import { Rooms, Messages, Users, SmarshHistory } from '../../../models'; +import { MessageTypes } from '../../../ui-utils'; import { smarsh } from '../lib/rocketchat'; import _ from 'underscore'; import moment from 'moment'; diff --git a/app/smarsh-connector/server/functions/sendEmail.js b/app/smarsh-connector/server/functions/sendEmail.js index a0bdf33df90..6c5b59e29ef 100644 --- a/app/smarsh-connector/server/functions/sendEmail.js +++ b/app/smarsh-connector/server/functions/sendEmail.js @@ -5,9 +5,9 @@ // files: ['i3nc9l3mn'] // } import _ from 'underscore'; -import * as Mailer from '/app/mailer'; -import { Uploads } from '/app/models'; -import { settings } from '/app/settings'; +import * as Mailer from '../../../mailer'; +import { Uploads } from '../../../models'; +import { settings } from '../../../settings'; import { UploadFS } from 'meteor/jalik:ufs'; import { smarsh } from '../lib/rocketchat'; diff --git a/app/smarsh-connector/server/settings.js b/app/smarsh-connector/server/settings.js index 0aadd952db7..2eac794cbb7 100644 --- a/app/smarsh-connector/server/settings.js +++ b/app/smarsh-connector/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import moment from 'moment'; import 'moment-timezone'; diff --git a/app/smarsh-connector/server/startup.js b/app/smarsh-connector/server/startup.js index c1f597413ff..763a4eb7a20 100644 --- a/app/smarsh-connector/server/startup.js +++ b/app/smarsh-connector/server/startup.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { SyncedCron } from 'meteor/littledata:synced-cron'; import { smarsh } from './lib/rocketchat'; import _ from 'underscore'; diff --git a/app/sms/server/SMS.js b/app/sms/server/SMS.js index 7b459f22907..0d4adbc91b8 100644 --- a/app/sms/server/SMS.js +++ b/app/sms/server/SMS.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; export const SMS = { enabled: false, diff --git a/app/sms/server/services/twilio.js b/app/sms/server/services/twilio.js index e679bc9d4c3..12d256cc7bb 100644 --- a/app/sms/server/services/twilio.js +++ b/app/sms/server/services/twilio.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { SMS } from '../SMS'; import twilio from 'twilio'; diff --git a/app/sms/server/settings.js b/app/sms/server/settings.js index 97a9090618d..9886dd64019 100644 --- a/app/sms/server/settings.js +++ b/app/sms/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('SMS', function() { diff --git a/app/spotify/lib/spotify.js b/app/spotify/lib/spotify.js index 6bb5d614cdb..2e2bcea6d02 100644 --- a/app/spotify/lib/spotify.js +++ b/app/spotify/lib/spotify.js @@ -2,7 +2,7 @@ * Spotify a named function that will process Spotify links or syntaxes (ex: spotify:track:1q6IK1l4qpYykOaWaLJkWG) * @param {Object} message - The message object */ -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/statistics/server/functions/get.js b/app/statistics/server/functions/get.js index aec26aa1c3d..7e06f74e7fa 100644 --- a/app/statistics/server/functions/get.js +++ b/app/statistics/server/functions/get.js @@ -3,10 +3,10 @@ import { MongoInternals } from 'meteor/mongo'; import _ from 'underscore'; import os from 'os'; import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; -import { Sessions, Settings, Users, Rooms, Subscriptions, Uploads, Messages, LivechatVisitors } from '/app/models'; -import { settings } from '/app/settings'; -import { Info } from '/app/utils'; -import { Migrations } from '/app/migrations'; +import { Sessions, Settings, Users, Rooms, Subscriptions, Uploads, Messages, LivechatVisitors } from '../../../models'; +import { settings } from '../../../settings'; +import { Info } from '../../../utils'; +import { Migrations } from '../../../migrations'; import { statistics } from '../../lib/rocketchat'; const wizardFields = [ diff --git a/app/statistics/server/functions/save.js b/app/statistics/server/functions/save.js index 32f6d583b24..9551d5f0158 100644 --- a/app/statistics/server/functions/save.js +++ b/app/statistics/server/functions/save.js @@ -1,4 +1,4 @@ -import { Statistics } from '/app/models'; +import { Statistics } from '../../../models'; import { statistics } from '../../lib/rocketchat'; statistics.save = function() { diff --git a/app/statistics/server/lib/SAUMonitor.js b/app/statistics/server/lib/SAUMonitor.js index 676798e8a30..5db2c6c518f 100644 --- a/app/statistics/server/lib/SAUMonitor.js +++ b/app/statistics/server/lib/SAUMonitor.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import UAParser from 'ua-parser-js'; import { UAParserMobile } from './UAParserMobile'; -import { Sessions } from '/app/models'; -import { Logger } from '/app/logger'; +import { Sessions } from '../../../models'; +import { Logger } from '../../../logger'; import { SyncedCron } from 'meteor/littledata:synced-cron'; const getDateObj = (dateTime = new Date()) => ({ diff --git a/app/statistics/server/methods/getStatistics.js b/app/statistics/server/methods/getStatistics.js index a6a4283bd2e..1aaefd6702d 100644 --- a/app/statistics/server/methods/getStatistics.js +++ b/app/statistics/server/methods/getStatistics.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Statistics } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Statistics } from '../../../models'; import { statistics } from '../../lib/rocketchat'; Meteor.methods({ diff --git a/app/theme/server/server.js b/app/theme/server/server.js index e9891679813..c4ccbb2ec77 100644 --- a/app/theme/server/server.js +++ b/app/theme/server/server.js @@ -1,7 +1,7 @@ import { WebApp } from 'meteor/webapp'; import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { Logger } from '/app/logger'; +import { settings } from '../../settings'; +import { Logger } from '../../logger'; import { WebAppHashing } from 'meteor/webapp-hashing'; import _ from 'underscore'; import less from 'less'; diff --git a/app/theme/server/variables.js b/app/theme/server/variables.js index 93a83a838ed..722cc144b76 100644 --- a/app/theme/server/variables.js +++ b/app/theme/server/variables.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { theme } from './server'; // TODO: Define registers/getters/setters for packages to work with established // heirarchy of colors instead of making duplicate definitions diff --git a/app/threading/client/createThreadMessageAction.js b/app/threading/client/createThreadMessageAction.js index d055427ddcc..17c924d4c62 100644 --- a/app/threading/client/createThreadMessageAction.js +++ b/app/threading/client/createThreadMessageAction.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; -import { MessageAction, modal } from '/app/ui-utils'; +import { Subscriptions } from '../../models'; +import { settings } from '../../settings'; +import { hasPermission } from '../../authorization'; +import { MessageAction, modal } from '../../ui-utils'; const condition = (rid, uid) => { diff --git a/app/threading/client/lib/messageTypes/threadMessage.js b/app/threading/client/lib/messageTypes/threadMessage.js index 2b6c1351db9..b1563ff6f0f 100644 --- a/app/threading/client/lib/messageTypes/threadMessage.js +++ b/app/threading/client/lib/messageTypes/threadMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { MessageTypes } from '/app/ui-utils'; +import { MessageTypes } from '../../../../ui-utils'; Meteor.startup(function() { MessageTypes.registerType({ diff --git a/app/threading/client/tabBar.js b/app/threading/client/tabBar.js index b3bd8004716..ccff2421566 100644 --- a/app/threading/client/tabBar.js +++ b/app/threading/client/tabBar.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { TabBar } from '/app/ui-utils'; +import { TabBar } from '../../ui-utils'; Meteor.startup(function() { return TabBar.addButton({ diff --git a/app/threading/client/threadFromMessageBox.js b/app/threading/client/threadFromMessageBox.js index 4fdbede2901..d146cb3efbc 100644 --- a/app/threading/client/threadFromMessageBox.js +++ b/app/threading/client/threadFromMessageBox.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { messageBox, modal } from '/app/ui-utils'; -import { settings } from '/app/settings'; +import { messageBox, modal } from '../../ui-utils'; +import { settings } from '../../settings'; Meteor.startup(function() { Tracker.autorun(() => { diff --git a/app/threading/client/views/ThreadList.js b/app/threading/client/views/ThreadList.js index b3a7415bc0b..96dcccb1ca6 100644 --- a/app/threading/client/views/ThreadList.js +++ b/app/threading/client/views/ThreadList.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { ChatSubscription } from '/app/models'; -import { getUserPreference } from '/app/utils'; -import { settings } from '/app/settings'; +import { ChatSubscription } from '../../../models'; +import { getUserPreference } from '../../../utils'; +import { settings } from '../../../settings'; Template.ThreadList.helpers({ rooms() { const user = Meteor.userId(); diff --git a/app/threading/client/views/creationDialog/CreateThread.js b/app/threading/client/views/creationDialog/CreateThread.js index 2dd6be4cb3c..d9e351be829 100755 --- a/app/threading/client/views/creationDialog/CreateThread.js +++ b/app/threading/client/views/creationDialog/CreateThread.js @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; -import { roomTypes } from '/app/utils'; -import { callbacks } from '/app/callbacks'; +import { roomTypes } from '../../../../utils'; +import { callbacks } from '../../../../callbacks'; import { Template } from 'meteor/templating'; import { ReactiveVar } from 'meteor/reactive-var'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; -import { ChatRoom, ChatSubscription } from '/app/models'; +import { ChatRoom, ChatSubscription } from '../../../../models'; import { Blaze } from 'meteor/blaze'; -import { call } from '/app/ui-utils'; +import { call } from '../../../../ui-utils'; import { TAPi18n } from 'meteor/tap:i18n'; import toastr from 'toastr'; diff --git a/app/threading/client/views/fieldTypeThreadLastMessageAge.js b/app/threading/client/views/fieldTypeThreadLastMessageAge.js index eff93b4877e..f96450e23f6 100644 --- a/app/threading/client/views/fieldTypeThreadLastMessageAge.js +++ b/app/threading/client/views/fieldTypeThreadLastMessageAge.js @@ -1,4 +1,4 @@ -import { registerFieldTemplate } from '/app/message-attachments'; +import { registerFieldTemplate } from '../../../message-attachments'; import { Template } from 'meteor/templating'; import moment from 'moment'; diff --git a/app/threading/client/views/fieldTypeThreadReplyCounter.js b/app/threading/client/views/fieldTypeThreadReplyCounter.js index 02a996ae036..cf027fd6017 100644 --- a/app/threading/client/views/fieldTypeThreadReplyCounter.js +++ b/app/threading/client/views/fieldTypeThreadReplyCounter.js @@ -1,4 +1,4 @@ -import { registerFieldTemplate } from '/app/message-attachments'; +import { registerFieldTemplate } from '../../../message-attachments'; import { Template } from 'meteor/templating'; import { FlowRouter } from 'meteor/kadira:flow-router'; diff --git a/app/threading/lib/threadRoomType.js b/app/threading/lib/threadRoomType.js index 01f825f130d..a75e55a9c3c 100644 --- a/app/threading/lib/threadRoomType.js +++ b/app/threading/lib/threadRoomType.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { RoomTypeConfig, roomTypes, getUserPreference } from '/app/utils'; +import { RoomTypeConfig, roomTypes, getUserPreference } from '../../utils'; export class ThreadRoomType extends RoomTypeConfig { constructor() { diff --git a/app/threading/server/authorization.js b/app/threading/server/authorization.js index 486cf818958..363a4139e35 100644 --- a/app/threading/server/authorization.js +++ b/app/threading/server/authorization.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { addRoomAccessValidator, canAccessRoom } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { addRoomAccessValidator, canAccessRoom } from '../../authorization'; +import { Rooms } from '../../models'; Meteor.startup(() => { addRoomAccessValidator(function(room, user) { diff --git a/app/threading/server/config.js b/app/threading/server/config.js index 5af8fd291dd..1550f965995 100644 --- a/app/threading/server/config.js +++ b/app/threading/server/config.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(() => { settings.addGroup('Threading', function() { diff --git a/app/threading/server/hooks/joinThreadOnMessage.js b/app/threading/server/hooks/joinThreadOnMessage.js index 7a7f1b1c136..00452c54434 100644 --- a/app/threading/server/hooks/joinThreadOnMessage.js +++ b/app/threading/server/hooks/joinThreadOnMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; -import { Subscriptions } from '/app/models'; +import { callbacks } from '../../../callbacks'; +import { Subscriptions } from '../../../models'; callbacks.add('beforeSaveMessage', (message, room) => { diff --git a/app/threading/server/hooks/propagateThreadMetadata.js b/app/threading/server/hooks/propagateThreadMetadata.js index a6e9498931e..946b5bb298c 100644 --- a/app/threading/server/hooks/propagateThreadMetadata.js +++ b/app/threading/server/hooks/propagateThreadMetadata.js @@ -1,7 +1,7 @@ -import { callbacks } from '/app/callbacks'; -import { Messages, Rooms } from '/app/models'; -import { deleteRoom } from '/app/lib'; +import { callbacks } from '../../../callbacks'; +import { Messages, Rooms } from '../../../models'; +import { deleteRoom } from '../../../lib'; /** * We need to propagate the writing of new message in a thread to the linking * system message diff --git a/app/threading/server/methods/createThread.js b/app/threading/server/methods/createThread.js index 9a3944720dd..681f47dda83 100644 --- a/app/threading/server/methods/createThread.js +++ b/app/threading/server/methods/createThread.js @@ -2,10 +2,10 @@ // import { FlowRouter } from 'meteor/kadira:flow-router'; import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -// import { getAvatarUrlFromUsername } from '/app/utils'; -import { hasAtLeastOnePermission, canAccessRoom } from '/app/authorization'; -import { Messages, Rooms } from '/app/models'; -import { createRoom, addUserToRoom, sendMessage, attachMessage } from '/app/lib'; +// import { getAvatarUrlFromUsername } from '../../../utils'; +import { hasAtLeastOnePermission, canAccessRoom } from '../../../authorization'; +import { Messages, Rooms } from '../../../models'; +import { createRoom, addUserToRoom, sendMessage, attachMessage } from '../../../lib'; const fields = [ { diff --git a/app/threading/server/permissions.js b/app/threading/server/permissions.js index 31bb393ec66..7faecc6e354 100644 --- a/app/threading/server/permissions.js +++ b/app/threading/server/permissions.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Permissions } from '/app/models'; +import { Permissions } from '../../models'; Meteor.startup(() => { // Add permissions for threading diff --git a/app/threading/server/publications/threadParentAutocomplete.js b/app/threading/server/publications/threadParentAutocomplete.js index c689d874456..b1b7d2f884e 100644 --- a/app/threading/server/publications/threadParentAutocomplete.js +++ b/app/threading/server/publications/threadParentAutocomplete.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; -import { hasPermission } from '/app/authorization'; +import { hasPermission } from '../../../authorization'; Meteor.publish('threadParentAutocomplete', function(selector) { if (!this.userId) { diff --git a/app/threading/server/publications/threadsOfRoom.js b/app/threading/server/publications/threadsOfRoom.js index 9a8467ad570..6172bb77e64 100644 --- a/app/threading/server/publications/threadsOfRoom.js +++ b/app/threading/server/publications/threadsOfRoom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../models'; Meteor.publish('threadsOfRoom', function(rid, limit = 50) { if (!this.userId) { diff --git a/app/tokenpass/client/roomType.js b/app/tokenpass/client/roomType.js index 2d88c036dce..c58735e9eca 100644 --- a/app/tokenpass/client/roomType.js +++ b/app/tokenpass/client/roomType.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { roomTypes, RoomTypeConfig } from '/app/utils'; +import { roomTypes, RoomTypeConfig } from '../../utils'; class TokenPassRoomType extends RoomTypeConfig { constructor() { diff --git a/app/tokenpass/client/startup.js b/app/tokenpass/client/startup.js index 3176fdb5629..2167827595c 100644 --- a/app/tokenpass/client/startup.js +++ b/app/tokenpass/client/startup.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { ChannelSettings } from '/app/channel-settings'; -import { Rooms } from '/app/models'; +import { ChannelSettings } from '../../channel-settings'; +import { Rooms } from '../../models'; Meteor.startup(function() { ChannelSettings.addOption({ diff --git a/app/tokenpass/client/tokenChannelsList.js b/app/tokenpass/client/tokenChannelsList.js index 732b164b500..4c9cbf9545c 100644 --- a/app/tokenpass/client/tokenChannelsList.js +++ b/app/tokenpass/client/tokenChannelsList.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../models'; Template.tokenChannelsList.helpers({ rooms() { diff --git a/app/tokenpass/client/tokenpassChannelSettings.js b/app/tokenpass/client/tokenpassChannelSettings.js index 2cea775f02a..da312c3bde7 100644 --- a/app/tokenpass/client/tokenpassChannelSettings.js +++ b/app/tokenpass/client/tokenpassChannelSettings.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; -import { ChatRoom } from '/app/models'; +import { t, handleError } from '../../utils'; +import { ChatRoom } from '../../models'; import toastr from 'toastr'; Template.channelSettings__tokenpass.helpers({ diff --git a/app/tokenpass/lib/common.js b/app/tokenpass/lib/common.js index aaaebe8058b..77de36d3e1e 100644 --- a/app/tokenpass/lib/common.js +++ b/app/tokenpass/lib/common.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { CustomOAuth } from '/app/custom-oauth'; +import { settings } from '../../settings'; +import { CustomOAuth } from '../../custom-oauth'; const config = { serverURL: '', diff --git a/app/tokenpass/server/cronRemoveUsers.js b/app/tokenpass/server/cronRemoveUsers.js index 7bb26d6e35a..0fe48870398 100644 --- a/app/tokenpass/server/cronRemoveUsers.js +++ b/app/tokenpass/server/cronRemoveUsers.js @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms, Subscriptions, Users } from '/app/models'; +import { Rooms, Subscriptions, Users } from '../../models'; import { SyncedCron } from 'meteor/littledata:synced-cron'; import { updateUserTokenpassBalances } from './functions/updateUserTokenpassBalances'; import { Tokenpass } from './Tokenpass'; async function removeUsersFromTokenChannels() { const rooms = {}; - const { removeUserFromRoom } = await import('/app/lib'); + const { removeUserFromRoom } = await import('../../lib'); Rooms.findAllTokenChannels().forEach((room) => { rooms[room._id] = room.tokenpass; diff --git a/app/tokenpass/server/functions/getProtectedTokenpassBalances.js b/app/tokenpass/server/functions/getProtectedTokenpassBalances.js index c5639ab2f99..93c3c3a055b 100644 --- a/app/tokenpass/server/functions/getProtectedTokenpassBalances.js +++ b/app/tokenpass/server/functions/getProtectedTokenpassBalances.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; let userAgent = 'Meteor'; if (Meteor.release) { userAgent += `/${ Meteor.release }`; } diff --git a/app/tokenpass/server/functions/getPublicTokenpassBalances.js b/app/tokenpass/server/functions/getPublicTokenpassBalances.js index 0fa67003522..d3b3a94d032 100644 --- a/app/tokenpass/server/functions/getPublicTokenpassBalances.js +++ b/app/tokenpass/server/functions/getPublicTokenpassBalances.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; let userAgent = 'Meteor'; if (Meteor.release) { userAgent += `/${ Meteor.release }`; } diff --git a/app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js b/app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js index 9178ee47a6c..c0d31a2d7fa 100644 --- a/app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js +++ b/app/tokenpass/server/functions/saveRoomTokensMinimumBalance.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; import s from 'underscore.string'; export const saveRoomTokensMinimumBalance = function(rid, roomTokensMinimumBalance) { diff --git a/app/tokenpass/server/functions/updateUserTokenpassBalances.js b/app/tokenpass/server/functions/updateUserTokenpassBalances.js index ca6d14c76ef..9fe7972e852 100644 --- a/app/tokenpass/server/functions/updateUserTokenpassBalances.js +++ b/app/tokenpass/server/functions/updateUserTokenpassBalances.js @@ -1,4 +1,4 @@ -import { Users } from '/app/models'; +import { Users } from '../../../models'; import { getPublicTokenpassBalances } from './getPublicTokenpassBalances'; import { getProtectedTokenpassBalances } from './getProtectedTokenpassBalances'; import _ from 'underscore'; diff --git a/app/tokenpass/server/methods/findTokenChannels.js b/app/tokenpass/server/methods/findTokenChannels.js index f9ce80c92c6..93039a49c42 100644 --- a/app/tokenpass/server/methods/findTokenChannels.js +++ b/app/tokenpass/server/methods/findTokenChannels.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; import { Tokenpass } from '../Tokenpass'; Meteor.methods({ diff --git a/app/tokenpass/server/methods/getChannelTokenpass.js b/app/tokenpass/server/methods/getChannelTokenpass.js index e40f43cdccb..bd446bfb80f 100644 --- a/app/tokenpass/server/methods/getChannelTokenpass.js +++ b/app/tokenpass/server/methods/getChannelTokenpass.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../../models'; Meteor.methods({ getChannelTokenpass(rid) { diff --git a/app/tokenpass/server/startup.js b/app/tokenpass/server/startup.js index 3b542249c0d..6d5384f71ce 100644 --- a/app/tokenpass/server/startup.js +++ b/app/tokenpass/server/startup.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { settings } from '/app/settings'; -import { addRoomAccessValidator } from '/app/authorization'; -import { Users } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../settings'; +import { addRoomAccessValidator } from '../../authorization'; +import { Users } from '../../models'; +import { callbacks } from '../../callbacks'; import { updateUserTokenpassBalances } from './functions/updateUserTokenpassBalances'; import { Tokenpass } from './Tokenpass'; diff --git a/app/ui-account/client/account.js b/app/ui-account/client/account.js index 9568e672ced..004a483693b 100644 --- a/app/ui-account/client/account.js +++ b/app/ui-account/client/account.js @@ -1,6 +1,6 @@ import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { SideNav } from '/app/ui-utils'; +import { SideNav } from '../../ui-utils'; Template.account.onRendered(function() { Tracker.afterFlush(function() { diff --git a/app/ui-account/client/accountFlex.js b/app/ui-account/client/accountFlex.js index 83f67a594fa..14dfd8fdfb2 100644 --- a/app/ui-account/client/accountFlex.js +++ b/app/ui-account/client/accountFlex.js @@ -1,8 +1,8 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { hasAllPermission } from '/app/authorization'; -import { SideNav, Layout } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { settings } from '../../settings'; +import { hasAllPermission } from '../../authorization'; +import { SideNav, Layout } from '../../ui-utils'; +import { t } from '../../utils'; Template.accountFlex.events({ 'click [data-action="close"]'() { diff --git a/app/ui-account/client/accountIntegrations.js b/app/ui-account/client/accountIntegrations.js index 5f4a954dee1..c610e04b809 100644 --- a/app/ui-account/client/accountIntegrations.js +++ b/app/ui-account/client/accountIntegrations.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { WebdavAccounts } from '/app/models'; -import { modal } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { WebdavAccounts } from '../../models'; +import { modal } from '../../ui-utils'; +import { t } from '../../utils'; import toastr from 'toastr'; Template.accountIntegrations.helpers({ diff --git a/app/ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js index a3fc6ce3e6d..3713f9167b5 100644 --- a/app/ui-account/client/accountPreferences.js +++ b/app/ui-account/client/accountPreferences.js @@ -4,11 +4,11 @@ import { Tracker } from 'meteor/tracker'; import { Reload } from 'meteor/reload'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError, getUserPreference } from '/app/utils'; -import { modal, SideNav } from '/app/ui-utils'; -import { KonchatNotification } from '/app/ui'; -import { settings } from '/app/settings'; -import { CustomSounds } from '/app/custom-sounds'; +import { t, handleError, getUserPreference } from '../../utils'; +import { modal, SideNav } from '../../ui-utils'; +import { KonchatNotification } from '../../ui'; +import { settings } from '../../settings'; +import { CustomSounds } from '../../custom-sounds'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/ui-account/client/accountProfile.js b/app/ui-account/client/accountProfile.js index 0647d85606b..d6ee828ea62 100644 --- a/app/ui-account/client/accountProfile.js +++ b/app/ui-account/client/accountProfile.js @@ -4,11 +4,11 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal, SideNav } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; -import { callbacks } from '/app/callbacks'; +import { modal, SideNav } from '../../ui-utils'; +import { t, handleError } from '../../utils'; +import { settings } from '../../settings'; +import { Notifications } from '../../notifications'; +import { callbacks } from '../../callbacks'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/ui-account/client/avatar/avatar.js b/app/ui-account/client/avatar/avatar.js index 2d9186c653a..77ba5ae856f 100644 --- a/app/ui-account/client/avatar/avatar.js +++ b/app/ui-account/client/avatar/avatar.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { getAvatarUrlFromUsername } from '/app/utils'; +import { getAvatarUrlFromUsername } from '../../../utils'; Template.avatar.helpers({ src() { diff --git a/app/ui-account/client/avatar/prompt.js b/app/ui-account/client/avatar/prompt.js index bbf9e7fbcbc..c54c67793c7 100644 --- a/app/ui-account/client/avatar/prompt.js +++ b/app/ui-account/client/avatar/prompt.js @@ -3,11 +3,11 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { SideNav } from '/app/ui-utils'; -import { t } from '/app/utils'; -import { fileUploadHandler } from '/app/file-upload'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { SideNav } from '../../../ui-utils'; +import { t } from '../../../utils'; +import { fileUploadHandler } from '../../../file-upload'; import s from 'underscore.string'; import toastr from 'toastr'; import mime from 'mime-type/with-db'; diff --git a/app/ui-admin/client/admin.js b/app/ui-admin/client/admin.js index 0d6f249736f..def6e3796a3 100644 --- a/app/ui-admin/client/admin.js +++ b/app/ui-admin/client/admin.js @@ -6,10 +6,10 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { SideNav, modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; -import { CachedCollection } from '/app/ui-cached-collection'; +import { settings } from '../../settings'; +import { SideNav, modal } from '../../ui-utils'; +import { t, handleError } from '../../utils'; +import { CachedCollection } from '../../ui-cached-collection'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js index a30379cf946..ad1e3912ca4 100644 --- a/app/ui-admin/client/adminFlex.js +++ b/app/ui-admin/client/adminFlex.js @@ -1,10 +1,10 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { CachedCollection } from '/app/ui-cached-collection'; -import { SideNav, AdminBox, Layout } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { settings } from '../../settings'; +import { CachedCollection } from '../../ui-cached-collection'; +import { SideNav, AdminBox, Layout } from '../../ui-utils'; +import { t } from '../../utils'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/ui-admin/client/adminInfo.js b/app/ui-admin/client/adminInfo.js index 74f2b5b8027..296842b9f75 100644 --- a/app/ui-admin/client/adminInfo.js +++ b/app/ui-admin/client/adminInfo.js @@ -3,9 +3,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { handleError, Info } from '/app/utils'; -import { hasAllPermission } from '/app/authorization'; -import { SideNav } from '/app/ui-utils'; +import { handleError, Info } from '../../utils'; +import { hasAllPermission } from '../../authorization'; +import { SideNav } from '../../ui-utils'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/app/ui-admin/client/rooms/adminRoomInfo.js b/app/ui-admin/client/rooms/adminRoomInfo.js index 4cf0ea8e5d9..62acbbe6825 100644 --- a/app/ui-admin/client/rooms/adminRoomInfo.js +++ b/app/ui-admin/client/rooms/adminRoomInfo.js @@ -3,12 +3,12 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; -import { call, modal } from '/app/ui-utils'; -import { hasAllPermission, hasAtLeastOnePermission } from '/app/authorization'; -import { ChannelSettings } from '/app/channel-settings'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { t, handleError } from '../../../utils'; +import { call, modal } from '../../../ui-utils'; +import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization'; +import { ChannelSettings } from '../../../channel-settings'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; import { AdminChatRoom } from './adminRooms'; import toastr from 'toastr'; diff --git a/app/ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js index fc7891d43ac..b40d0f7aa9a 100644 --- a/app/ui-admin/client/rooms/adminRooms.js +++ b/app/ui-admin/client/rooms/adminRooms.js @@ -5,10 +5,10 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { SideNav, RocketChatTabBar, TabBar } from '/app/ui-utils'; -import { t, roomTypes } from '/app/utils'; -import { hasAllPermission } from '/app/authorization'; -import { ChannelSettings } from '/app/channel-settings'; +import { SideNav, RocketChatTabBar, TabBar } from '../../../ui-utils'; +import { t, roomTypes } from '../../../utils'; +import { hasAllPermission } from '../../../authorization'; +import { ChannelSettings } from '../../../channel-settings'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/ui-admin/client/rooms/channelSettingsDefault.js b/app/ui-admin/client/rooms/channelSettingsDefault.js index 80f9e1aa3ca..e98394d0487 100644 --- a/app/ui-admin/client/rooms/channelSettingsDefault.js +++ b/app/ui-admin/client/rooms/channelSettingsDefault.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; +import { t, handleError } from '../../../utils'; import { AdminChatRoom } from './adminRooms'; import toastr from 'toastr'; diff --git a/app/ui-admin/client/users/adminInviteUser.js b/app/ui-admin/client/users/adminInviteUser.js index 890e1e71c5d..a7079d540e8 100644 --- a/app/ui-admin/client/users/adminInviteUser.js +++ b/app/ui-admin/client/users/adminInviteUser.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { t, handleError } from '/app/utils'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { t, handleError } from '../../../utils'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/ui-admin/client/users/adminUsers.js b/app/ui-admin/client/users/adminUsers.js index 39d7ea572b0..648250b393b 100644 --- a/app/ui-admin/client/users/adminUsers.js +++ b/app/ui-admin/client/users/adminUsers.js @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { SideNav, TabBar, RocketChatTabBar } from '/app/ui-utils'; +import { SideNav, TabBar, RocketChatTabBar } from '../../../ui-utils'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/ui-admin/server/publications/adminRooms.js b/app/ui-admin/server/publications/adminRooms.js index 973e4fda86c..f50d43fc849 100644 --- a/app/ui-admin/server/publications/adminRooms.js +++ b/app/ui-admin/server/publications/adminRooms.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../../authorization'; +import { Rooms } from '../../../models'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/ui-cached-collection/client/models/CachedCollection.js b/app/ui-cached-collection/client/models/CachedCollection.js index 733fa962255..3cebf71f880 100644 --- a/app/ui-cached-collection/client/models/CachedCollection.js +++ b/app/ui-cached-collection/client/models/CachedCollection.js @@ -5,7 +5,7 @@ import { Accounts } from 'meteor/accounts-base'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import localforage from 'localforage'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../../callbacks'; import _ from 'underscore'; class CachedCollectionManagerClass { @@ -346,9 +346,9 @@ export class CachedCollection { async setupListener(eventType, eventName) { Meteor.startup(async() => { - const { Notifications } = await import('/app/notifications'); - const { RoomManager } = await import('/app/ui-utils'); - const { ChatRoom, CachedChatRoom } = await import('/app/models'); + const { Notifications } = await import('../../../notifications'); + const { RoomManager } = await import('../../../ui-utils'); + const { ChatRoom, CachedChatRoom } = await import('../../../models'); Notifications[eventType || this.eventType](eventName || this.eventName, (t, record) => { this.log('record received', t, record); callbacks.run(`cachedCollection-received-${ this.name }`, record, t); diff --git a/app/ui-clean-history/client/lib/startup.js b/app/ui-clean-history/client/lib/startup.js index 1004a69b2e7..019463c3c34 100644 --- a/app/ui-clean-history/client/lib/startup.js +++ b/app/ui-clean-history/client/lib/startup.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { TabBar } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { TabBar } from '../../../ui-utils'; +import { hasAllPermission } from '../../../authorization'; Meteor.startup(() => { TabBar.addButton({ diff --git a/app/ui-clean-history/client/views/cleanHistory.js b/app/ui-clean-history/client/views/cleanHistory.js index 390720b6cfd..855f75813e4 100644 --- a/app/ui-clean-history/client/views/cleanHistory.js +++ b/app/ui-clean-history/client/views/cleanHistory.js @@ -4,10 +4,10 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; -import { ChatRoom } from '/app/models'; -import { t, roomTypes } from '/app/utils'; -import { settings } from '/app/settings'; -import { modal, call } from '/app/ui-utils'; +import { ChatRoom } from '../../../models'; +import { t, roomTypes } from '../../../utils'; +import { settings } from '../../../settings'; +import { modal, call } from '../../../ui-utils'; import moment from 'moment'; const getRoomName = function() { diff --git a/app/ui-flextab/client/flexTabBar.js b/app/ui-flextab/client/flexTabBar.js index a11df12d274..663df68860a 100644 --- a/app/ui-flextab/client/flexTabBar.js +++ b/app/ui-flextab/client/flexTabBar.js @@ -3,9 +3,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { hasAllPermission } from '/app/authorization'; -import { popover, TabBar, Layout } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { hasAllPermission } from '../../authorization'; +import { popover, TabBar, Layout } from '../../ui-utils'; +import { t } from '../../utils'; import _ from 'underscore'; const commonHelpers = { diff --git a/app/ui-flextab/client/tabs/inviteUsers.js b/app/ui-flextab/client/tabs/inviteUsers.js index 6c94080a926..f526db0705b 100644 --- a/app/ui-flextab/client/tabs/inviteUsers.js +++ b/app/ui-flextab/client/tabs/inviteUsers.js @@ -4,8 +4,8 @@ import { Blaze } from 'meteor/blaze'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; -import { settings } from '/app/settings'; -import { t } from '/app/utils'; +import { settings } from '../../../settings'; +import { t } from '../../../utils'; import { Deps } from 'meteor/deps'; import toastr from 'toastr'; diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js index 117b5d88923..6eed72bcd7e 100644 --- a/app/ui-flextab/client/tabs/membersList.js +++ b/app/ui-flextab/client/tabs/membersList.js @@ -3,11 +3,11 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { RoomManager, popover } from '/app/ui-utils'; -import { ChatRoom, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { t, isRtl, handleError, roomTypes } from '/app/utils'; -import { WebRTC } from '/app/webrtc'; +import { RoomManager, popover } from '../../../ui-utils'; +import { ChatRoom, Subscriptions } from '../../../models'; +import { settings } from '../../../settings'; +import { t, isRtl, handleError, roomTypes } from '../../../utils'; +import { WebRTC } from '../../../webrtc'; import _ from 'underscore'; import { getActions } from './userActions'; diff --git a/app/ui-flextab/client/tabs/uploadedFilesList.js b/app/ui-flextab/client/tabs/uploadedFilesList.js index 1f4bbc4a097..bfb83e675ba 100644 --- a/app/ui-flextab/client/tabs/uploadedFilesList.js +++ b/app/ui-flextab/client/tabs/uploadedFilesList.js @@ -1,8 +1,8 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; -import { DateFormat } from '/app/lib'; -import { t } from '/app/utils'; -import { popover } from '/app/ui-utils'; +import { DateFormat } from '../../../lib'; +import { t } from '../../../utils'; +import { popover } from '../../../ui-utils'; import { Template } from 'meteor/templating'; import _ from 'underscore'; diff --git a/app/ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js index 76758c496ae..a0e2bbfb37f 100644 --- a/app/ui-flextab/client/tabs/userActions.js +++ b/app/ui-flextab/client/tabs/userActions.js @@ -2,12 +2,12 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; -import { WebRTC } from '/app/webrtc'; -import { ChatRoom, ChatSubscription, RoomRoles, Subscriptions } from '/app/models'; -import { modal } from '/app/ui-utils'; -import { t, handleError } from '/app/utils'; -import { settings } from '/app/settings'; -import { hasAllPermission, hasRole } from '/app/authorization'; +import { WebRTC } from '../../../webrtc'; +import { ChatRoom, ChatSubscription, RoomRoles, Subscriptions } from '../../../models'; +import { modal } from '../../../ui-utils'; +import { t, handleError } from '../../../utils'; +import { settings } from '../../../settings'; +import { hasAllPermission, hasRole } from '../../../authorization'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/ui-flextab/client/tabs/userEdit.js b/app/ui-flextab/client/tabs/userEdit.js index 4dd34b5921b..2e7e4afa08d 100644 --- a/app/ui-flextab/client/tabs/userEdit.js +++ b/app/ui-flextab/client/tabs/userEdit.js @@ -3,9 +3,9 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, handleError } from '/app/utils'; -import { Roles } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { t, handleError } from '../../../utils'; +import { Roles } from '../../../models'; +import { hasAtLeastOnePermission } from '../../../authorization'; import toastr from 'toastr'; import s from 'underscore.string'; diff --git a/app/ui-flextab/client/tabs/userInfo.js b/app/ui-flextab/client/tabs/userInfo.js index 01016a30fc8..8244e195cc0 100644 --- a/app/ui-flextab/client/tabs/userInfo.js +++ b/app/ui-flextab/client/tabs/userInfo.js @@ -6,11 +6,11 @@ import { TAPi18n } from 'meteor/tap:i18n'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; -import { DateFormat } from '/app/lib'; -import { popover } from '/app/ui-utils'; -import { templateVarHandler } from '/app/utils'; -import { RoomRoles, UserRoles, Roles } from '/app/models'; -import { settings } from '/app/settings'; +import { DateFormat } from '../../../lib'; +import { popover } from '../../../ui-utils'; +import { templateVarHandler } from '../../../utils'; +import { RoomRoles, UserRoles, Roles } from '../../../models'; +import { settings } from '../../../settings'; import { getActions } from './userActions'; const more = function() { diff --git a/app/ui-login/client/login/footer.js b/app/ui-login/client/login/footer.js index 026115e1c07..6ca2466a6a5 100644 --- a/app/ui-login/client/login/footer.js +++ b/app/ui-login/client/login/footer.js @@ -1,7 +1,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.loginFooter.onCreated(function() { this.suggestedLanguage = new ReactiveVar(); diff --git a/app/ui-login/client/login/form.js b/app/ui-login/client/login/form.js index 565d5018a31..d1c7f8c584c 100644 --- a/app/ui-login/client/login/form.js +++ b/app/ui-login/client/login/form.js @@ -4,9 +4,9 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { t, handleError } from '/app/utils'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { t, handleError } from '../../../utils'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/ui-login/client/login/header.js b/app/ui-login/client/login/header.js index df3c7af96ee..96586ecf72f 100644 --- a/app/ui-login/client/login/header.js +++ b/app/ui-login/client/login/header.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.loginHeader.helpers({ logoUrl() { diff --git a/app/ui-login/client/login/layout.js b/app/ui-login/client/login/layout.js index 7b0ccb2bb79..3bb39ee47e9 100644 --- a/app/ui-login/client/login/layout.js +++ b/app/ui-login/client/login/layout.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.loginLayout.onRendered(function() { $('#initial-page-loading').remove(); diff --git a/app/ui-login/client/login/services.js b/app/ui-login/client/login/services.js index 1f1841a1f9c..99ca7acce3a 100644 --- a/app/ui-login/client/login/services.js +++ b/app/ui-login/client/login/services.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { CustomOAuth } from '/app/custom-oauth'; +import { CustomOAuth } from '../../../custom-oauth'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/app/ui-login/client/reset-password/resetPassword.js b/app/ui-login/client/reset-password/resetPassword.js index ced4610fcfe..626018b20aa 100644 --- a/app/ui-login/client/reset-password/resetPassword.js +++ b/app/ui-login/client/reset-password/resetPassword.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t } from '/app/utils'; -import { Button } from '/app/ui'; -import { callbacks } from '/app/callbacks'; +import { modal } from '../../../ui-utils'; +import { t } from '../../../utils'; +import { Button } from '../../../ui'; +import { callbacks } from '../../../callbacks'; import toastr from 'toastr'; Template.resetPassword.helpers({ diff --git a/app/ui-login/client/username/layout.js b/app/ui-login/client/username/layout.js index 7a64ab055d1..670aa9b5bd0 100644 --- a/app/ui-login/client/username/layout.js +++ b/app/ui-login/client/username/layout.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.usernameLayout.helpers({ backgroundUrl() { diff --git a/app/ui-login/client/username/username.js b/app/ui-login/client/username/username.js index dd375766034..5d82c1a29b1 100644 --- a/app/ui-login/client/username/username.js +++ b/app/ui-login/client/username/username.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { Button } from '/app/ui'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../../settings'; +import { Button } from '../../../ui'; +import { callbacks } from '../../../callbacks'; import _ from 'underscore'; Template.username.onCreated(function() { diff --git a/app/ui-master/client/main.js b/app/ui-master/client/main.js index f4f19922f23..1f46bd92e85 100644 --- a/app/ui-master/client/main.js +++ b/app/ui-master/client/main.js @@ -2,16 +2,16 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { t, getUserPreference } from '/app/utils'; +import { t, getUserPreference } from '../../utils'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { mainReady, Layout, iframeLogin, modal, popover, menu, fireGlobalEvent } from '/app/ui-utils'; -import { toolbarSearch } from '/app/ui-sidenav'; -import { settings } from '/app/settings'; -import { CachedChatSubscription, Roles, ChatSubscription } from '/app/models'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; -import { hasRole } from '/app/authorization'; -import { tooltip } from '/app/tooltip'; +import { mainReady, Layout, iframeLogin, modal, popover, menu, fireGlobalEvent } from '../../ui-utils'; +import { toolbarSearch } from '../../ui-sidenav'; +import { settings } from '../../settings'; +import { CachedChatSubscription, Roles, ChatSubscription } from '../../models'; +import { CachedCollectionManager } from '../../ui-cached-collection'; +import { hasRole } from '../../authorization'; +import { tooltip } from '../../tooltip'; import Clipboard from 'clipboard'; import s from 'underscore.string'; diff --git a/app/ui-master/server/inject.js b/app/ui-master/server/inject.js index 095b6e6d161..5fd028f0ce1 100644 --- a/app/ui-master/server/inject.js +++ b/app/ui-master/server/inject.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Inject } from 'meteor/meteorhacks:inject-initial'; -import { Settings } from '/app/models'; -import { settings } from '/app/settings'; +import { Settings } from '../../models'; +import { settings } from '../../settings'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js index f321c86e2f8..03bfc06a571 100644 --- a/app/ui-message/client/message.js +++ b/app/ui-message/client/message.js @@ -5,16 +5,16 @@ import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import _ from 'underscore'; import moment from 'moment'; -import { DateFormat } from '/app/lib'; -import { renderEmoji } from '/app/emoji'; -import { renderMessageBody, MessageTypes, MessageAction } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { RoomRoles, UserRoles, Roles, Subscriptions, Rooms } from '/app/models'; -import { AutoTranslate } from '/app/autotranslate'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; -import { Markdown } from '/app/markdown'; -import { t, getUserPreference, roomTypes } from '/app/utils'; +import { DateFormat } from '../../lib'; +import { renderEmoji } from '../../emoji'; +import { renderMessageBody, MessageTypes, MessageAction } from '../../ui-utils'; +import { settings } from '../../settings'; +import { RoomRoles, UserRoles, Roles, Subscriptions, Rooms } from '../../models'; +import { AutoTranslate } from '../../autotranslate'; +import { hasAtLeastOnePermission } from '../../authorization'; +import { callbacks } from '../../callbacks'; +import { Markdown } from '../../markdown'; +import { t, getUserPreference, roomTypes } from '../../utils'; async function renderPdfToCanvas(canvasId, pdfLink) { const isSafari = /constructor/i.test(window.HTMLElement) || diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js index 35a2ea43633..c481830e3d2 100644 --- a/app/ui-message/client/messageBox.js +++ b/app/ui-message/client/messageBox.js @@ -3,20 +3,20 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { Tracker } from 'meteor/tracker'; -import { EmojiPicker } from '/app/emoji'; -import { katex } from '/app/katex'; -import { Markdown } from '/app/markdown'; -import { ChatSubscription } from '/app/models'; -import { settings } from '/app/settings'; +import { EmojiPicker } from '../../emoji'; +import { katex } from '../../katex'; +import { Markdown } from '../../markdown'; +import { ChatSubscription } from '../../models'; +import { settings } from '../../settings'; import { AudioRecorder, ChatMessages, chatMessages, fileUpload, KonchatNotification, -} from '/app/ui'; -import { Layout, messageBox, popover, RoomManager } from '/app/ui-utils'; -import { t, roomTypes, getUserPreference } from '/app/utils'; +} from '../../ui'; +import { Layout, messageBox, popover, RoomManager } from '../../ui-utils'; +import { t, roomTypes, getUserPreference } from '../../utils'; import moment from 'moment'; import './messageBoxReplyPreview'; import './messageBoxTyping'; diff --git a/app/ui-message/client/messageBoxAudioMessage.js b/app/ui-message/client/messageBoxAudioMessage.js index 0a6b0f0e240..d5109939294 100644 --- a/app/ui-message/client/messageBoxAudioMessage.js +++ b/app/ui-message/client/messageBoxAudioMessage.js @@ -2,10 +2,10 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { fileUploadHandler } from '/app/file-upload'; -import { AudioRecorder, chatMessages } from '/app/ui'; -import { call } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { fileUploadHandler } from '../../file-upload'; +import { AudioRecorder, chatMessages } from '../../ui'; +import { call } from '../../ui-utils'; +import { t } from '../../utils'; import './messageBoxAudioMessage.html'; const startRecording = () => new Promise((resolve) => AudioRecorder.start(resolve)); diff --git a/app/ui-message/client/messageBoxNotSubscribed.js b/app/ui-message/client/messageBoxNotSubscribed.js index 5f9ddbe5a42..e9cf456d4db 100644 --- a/app/ui-message/client/messageBoxNotSubscribed.js +++ b/app/ui-message/client/messageBoxNotSubscribed.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { RoomHistoryManager, RoomManager, call } from '/app/ui-utils'; -import { t, roomTypes } from '/app/utils'; -import { hasAllPermission } from '/app/authorization'; +import { settings } from '../../settings'; +import { RoomHistoryManager, RoomManager, call } from '../../ui-utils'; +import { t, roomTypes } from '../../utils'; +import { hasAllPermission } from '../../authorization'; import toastr from 'toastr'; import './messageBoxNotSubscribed.html'; diff --git a/app/ui-message/client/messageBoxTyping.js b/app/ui-message/client/messageBoxTyping.js index 5503bd7110d..044ca617485 100644 --- a/app/ui-message/client/messageBoxTyping.js +++ b/app/ui-message/client/messageBoxTyping.js @@ -1,6 +1,6 @@ import { Template } from 'meteor/templating'; -import { MsgTyping } from '/app/ui'; -import { t } from '/app/utils'; +import { MsgTyping } from '../../ui'; +import { t } from '../../utils'; import './messageBoxTyping.html'; diff --git a/app/ui-message/client/popup/messagePopup.js b/app/ui-message/client/popup/messagePopup.js index c730e6e2d7d..b2e3fec4a83 100644 --- a/app/ui-message/client/popup/messagePopup.js +++ b/app/ui-message/client/popup/messagePopup.js @@ -4,9 +4,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { toolbarSearch } from '/app/ui-sidenav'; +import { toolbarSearch } from '../../../ui-sidenav'; import _ from 'underscore'; -import { lazyloadtick } from '/app/lazy-load'; +import { lazyloadtick } from '../../../lazy-load'; const keys = { TAB: 9, diff --git a/app/ui-message/client/popup/messagePopupChannel.js b/app/ui-message/client/popup/messagePopupChannel.js index d16aa03cb76..9ceed3b0180 100644 --- a/app/ui-message/client/popup/messagePopupChannel.js +++ b/app/ui-message/client/popup/messagePopupChannel.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { roomTypes } from '/app/utils'; +import { roomTypes } from '../../../utils'; Template.messagePopupChannel.helpers({ channelIcon() { diff --git a/app/ui-message/client/popup/messagePopupConfig.js b/app/ui-message/client/popup/messagePopupConfig.js index d9145dcba19..62c07e2c783 100644 --- a/app/ui-message/client/popup/messagePopupConfig.js +++ b/app/ui-message/client/popup/messagePopupConfig.js @@ -5,11 +5,11 @@ import { Blaze } from 'meteor/blaze'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Messages, Subscriptions, Users } from '/app/models'; -import { hasAllPermission, hasAtLeastOnePermission } from '/app/authorization'; -import { EmojiPicker, emoji } from '/app/emoji'; -import { RoomManager } from '/app/ui-utils'; -import { t, getUserPreference, slashCommands } from '/app/utils'; +import { Messages, Subscriptions, Users } from '../../../models'; +import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization'; +import { EmojiPicker, emoji } from '../../../emoji'; +import { RoomManager } from '../../../ui-utils'; +import { t, getUserPreference, slashCommands } from '../../../utils'; import _ from 'underscore'; const usersFromRoomMessages = new Mongo.Collection(null); diff --git a/app/ui-message/client/popup/messagePopupSlashCommandPreview.js b/app/ui-message/client/popup/messagePopupSlashCommandPreview.js index aa235bb3cb7..1babce36b8a 100644 --- a/app/ui-message/client/popup/messagePopupSlashCommandPreview.js +++ b/app/ui-message/client/popup/messagePopupSlashCommandPreview.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { slashCommands } from '/app/utils'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { toolbarSearch } from '/app/ui-sidenav'; +import { slashCommands } from '../../../utils'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { toolbarSearch } from '../../../ui-sidenav'; import _ from 'underscore'; const keys = { diff --git a/app/ui-message/client/startup/messageBoxActions.js b/app/ui-message/client/startup/messageBoxActions.js index 90a0ddad0d7..9095542642b 100644 --- a/app/ui-message/client/startup/messageBoxActions.js +++ b/app/ui-message/client/startup/messageBoxActions.js @@ -3,11 +3,11 @@ import { Random } from 'meteor/random'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import mime from 'mime-type/with-db'; -import { VRecDialog } from '/app/ui-vrecord'; -import { messageBox, modal } from '/app/ui-utils'; -import { fileUpload } from '/app/ui'; -import { settings } from '/app/settings'; -import { t } from '/app/utils'; +import { VRecDialog } from '../../../ui-vrecord'; +import { messageBox, modal } from '../../../ui-utils'; +import { fileUpload } from '../../../ui'; +import { settings } from '../../../settings'; +import { t } from '../../../utils'; messageBox.actions.add('Create_new', 'Video_message', { id: 'video-message', diff --git a/app/ui-message/client/startup/restoreText.js b/app/ui-message/client/startup/restoreText.js index 18ae8ee0d1d..833019ab678 100644 --- a/app/ui-message/client/startup/restoreText.js +++ b/app/ui-message/client/startup/restoreText.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { RoomManager } from '/app/ui-utils'; -import { chatMessages } from '/app/ui'; -import { callbacks } from '/app/callbacks'; +import { RoomManager } from '../../../ui-utils'; +import { chatMessages } from '../../../ui'; +import { callbacks } from '../../../callbacks'; Meteor.startup(() => { diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js index 9eda8fe15b5..b1001c5069a 100644 --- a/app/ui-sidenav/client/chatRoomItem.js +++ b/app/ui-sidenav/client/chatRoomItem.js @@ -1,11 +1,11 @@ import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { t } from '/app/utils'; -import { settings } from '/app/settings'; -import { roomTypes } from '/app/utils'; -import { Rooms } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { t } from '../../utils'; +import { settings } from '../../settings'; +import { roomTypes } from '../../utils'; +import { Rooms } from '../../models'; +import { callbacks } from '../../callbacks'; Template.chatRoomItem.helpers({ roomData() { diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js index d1a0ea2ce13..08832c01a96 100644 --- a/app/ui-sidenav/client/roomList.js +++ b/app/ui-sidenav/client/roomList.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; import { Template } from 'meteor/templating'; -import { ChatSubscription, Rooms, Users, Subscriptions } from '/app/models'; -import { UiTextContext, getUserPreference, roomTypes } from '/app/utils'; -import { settings } from '/app/settings'; +import { ChatSubscription, Rooms, Users, Subscriptions } from '../../models'; +import { UiTextContext, getUserPreference, roomTypes } from '../../utils'; +import { settings } from '../../settings'; Template.roomList.helpers({ rooms() { diff --git a/app/ui-sidenav/client/sideNav.js b/app/ui-sidenav/client/sideNav.js index 9323af62e29..d16ab2d4113 100644 --- a/app/ui-sidenav/client/sideNav.js +++ b/app/ui-sidenav/client/sideNav.js @@ -1,12 +1,12 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; -import { lazyloadtick } from '/app/lazy-load'; +import { lazyloadtick } from '../../lazy-load'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { SideNav, menu } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { roomTypes, getUserPreference } from '/app/utils'; -import { Users } from '/app/models'; +import { SideNav, menu } from '../../ui-utils'; +import { settings } from '../../settings'; +import { roomTypes, getUserPreference } from '../../utils'; +import { Users } from '../../models'; Template.sideNav.helpers({ flexTemplate() { diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js index 0219961b4db..c756ff26210 100644 --- a/app/ui-sidenav/client/sidebarHeader.js +++ b/app/ui-sidenav/client/sidebarHeader.js @@ -2,13 +2,13 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { popover } from '/app/ui-utils'; -import { t, getUserPreference, handleError } from '/app/utils'; -import { AccountBox, menu, SideNav } from '/app/ui-utils'; -import { callbacks } from '/app/callbacks'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { modal } from '/app/ui-utils'; +import { popover } from '../../ui-utils'; +import { t, getUserPreference, handleError } from '../../utils'; +import { AccountBox, menu, SideNav } from '../../ui-utils'; +import { callbacks } from '../../callbacks'; +import { settings } from '../../settings'; +import { hasAtLeastOnePermission } from '../../authorization'; +import { modal } from '../../ui-utils'; const setStatus = (status) => { AccountBox.setStatus(status); callbacks.run('userStatusManuallySet', status); diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js index 7cd9d9263cb..a9d623eb1c4 100644 --- a/app/ui-sidenav/client/sidebarItem.js +++ b/app/ui-sidenav/client/sidebarItem.js @@ -2,13 +2,13 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { t, getUserPreference, roomTypes } from '/app/utils'; +import { t, getUserPreference, roomTypes } from '../../utils'; import moment from 'moment'; -import { popover, renderMessageBody } from '/app/ui-utils'; -import { Users, ChatSubscription } from '/app/models'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { menu } from '/app/ui-utils'; +import { popover, renderMessageBody } from '../../ui-utils'; +import { Users, ChatSubscription } from '../../models'; +import { settings } from '../../settings'; +import { hasAtLeastOnePermission } from '../../authorization'; +import { menu } from '../../ui-utils'; Template.sidebarItem.helpers({ or(...args) { diff --git a/app/ui-sidenav/client/sortlist.js b/app/ui-sidenav/client/sortlist.js index 706401e2772..c93ab0480ca 100644 --- a/app/ui-sidenav/client/sortlist.js +++ b/app/ui-sidenav/client/sortlist.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { popover } from '/app/ui-utils'; -import { getUserPreference } from '/app/utils'; -import { settings } from '/app/settings'; +import { popover } from '../../ui-utils'; +import { getUserPreference } from '../../utils'; +import { settings } from '../../settings'; const checked = function(prop, field) { const userId = Meteor.userId(); diff --git a/app/ui-sidenav/client/toolbar.js b/app/ui-sidenav/client/toolbar.js index 7d1b9b83a0f..3643b5b6748 100644 --- a/app/ui-sidenav/client/toolbar.js +++ b/app/ui-sidenav/client/toolbar.js @@ -5,10 +5,10 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Subscriptions } from '/app/models'; -import { roomTypes } from '/app/utils'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { menu } from '/app/ui-utils'; +import { Rooms, Subscriptions } from '../../models'; +import { roomTypes } from '../../utils'; +import { hasAtLeastOnePermission } from '../../authorization'; +import { menu } from '../../ui-utils'; import { toolbarSearch } from './sidebarHeader'; import _ from 'underscore'; diff --git a/app/ui-utils/client/lib/ChannelActions.js b/app/ui-utils/client/lib/ChannelActions.js index cc99ebd646c..b0cd7e57781 100644 --- a/app/ui-utils/client/lib/ChannelActions.js +++ b/app/ui-utils/client/lib/ChannelActions.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -import { t, UiTextContext, roomTypes, handleError } from '/app/utils'; +import { t, UiTextContext, roomTypes, handleError } from '../../../utils'; import { modal } from './modal'; import { call } from './callMethod'; import { RoomManager } from './RoomManager'; diff --git a/app/ui-utils/client/lib/IframeLogin.js b/app/ui-utils/client/lib/IframeLogin.js index 8a9ef1ad0af..caa389d33d3 100644 --- a/app/ui-utils/client/lib/IframeLogin.js +++ b/app/ui-utils/client/lib/IframeLogin.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { Accounts } from 'meteor/accounts-base'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js index 7650cbd1ff0..d795ccab92f 100644 --- a/app/ui-utils/client/lib/MessageAction.js +++ b/app/ui-utils/client/lib/MessageAction.js @@ -3,10 +3,10 @@ import { TAPi18n } from 'meteor/tap:i18n'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; -import { t, handleError, roomTypes } from '/app/utils'; -import { Messages, Rooms, Subscriptions } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { t, handleError, roomTypes } from '../../../utils'; +import { Messages, Rooms, Subscriptions } from '../../../models'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { settings } from '../../../settings'; import _ from 'underscore'; import moment from 'moment'; import toastr from 'toastr'; @@ -147,7 +147,7 @@ export const MessageAction = new class { }; Meteor.startup(async function() { - const { chatMessages } = await import('/app/ui'); + const { chatMessages } = await import('../../../ui'); MessageAction.addButton({ id: 'reply-message', icon: 'reply', diff --git a/app/ui-utils/client/lib/RoomHistoryManager.js b/app/ui-utils/client/lib/RoomHistoryManager.js index 081096d5ec7..6f59aec7258 100644 --- a/app/ui-utils/client/lib/RoomHistoryManager.js +++ b/app/ui-utils/client/lib/RoomHistoryManager.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Blaze } from 'meteor/blaze'; -import { UserRoles, RoomRoles, ChatMessage, ChatSubscription, ChatRoom } from '/app/models'; +import { UserRoles, RoomRoles, ChatMessage, ChatSubscription, ChatRoom } from '../../../models'; import _ from 'underscore'; import { RoomManager } from './RoomManager'; import { readMessage } from './readMessages'; diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js index 7c58a53706e..d7319e27a6c 100644 --- a/app/ui-utils/client/lib/RoomManager.js +++ b/app/ui-utils/client/lib/RoomManager.js @@ -4,13 +4,13 @@ import { Tracker } from 'meteor/tracker'; import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { roomTypes as _roomTypes } from '/app/utils'; +import { roomTypes as _roomTypes } from '../../../utils'; import { fireGlobalEvent } from './fireGlobalEvent'; -import { promises } from '/app/promises'; -import { callbacks } from '/app/callbacks'; -import { Notifications } from '/app/notifications'; -import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '/app/models'; -import { CachedCollectionManager } from '/app/ui-cached-collection'; +import { promises } from '../../../promises'; +import { callbacks } from '../../../callbacks'; +import { Notifications } from '../../../notifications'; +import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models'; +import { CachedCollectionManager } from '../../../ui-cached-collection'; import _ from 'underscore'; import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager'; import { mainReady } from './mainReady'; diff --git a/app/ui-utils/client/lib/SideNav.js b/app/ui-utils/client/lib/SideNav.js index 5ea2322605d..69fa3f9524a 100644 --- a/app/ui-utils/client/lib/SideNav.js +++ b/app/ui-utils/client/lib/SideNav.js @@ -1,7 +1,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -import { roomTypes } from '/app/utils'; -import { Subscriptions } from '/app/models'; +import { roomTypes } from '../../../utils'; +import { Subscriptions } from '../../../models'; import { AccountBox } from './AccountBox'; export const SideNav = new class { diff --git a/app/ui-utils/client/lib/avatar.js b/app/ui-utils/client/lib/avatar.js index 81f27fb9e68..f2e6d903308 100644 --- a/app/ui-utils/client/lib/avatar.js +++ b/app/ui-utils/client/lib/avatar.js @@ -1,6 +1,6 @@ import { Blaze } from 'meteor/blaze'; import { Session } from 'meteor/session'; -import { getAvatarUrlFromUsername } from '/app/utils'; +import { getAvatarUrlFromUsername } from '../../../utils'; import { RoomManager } from './RoomManager'; Blaze.registerHelper('avatarUrlFromUsername', getAvatarUrlFromUsername); diff --git a/app/ui-utils/client/lib/callMethod.js b/app/ui-utils/client/lib/callMethod.js index d0fccca2356..5a4ca263d67 100644 --- a/app/ui-utils/client/lib/callMethod.js +++ b/app/ui-utils/client/lib/callMethod.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { handleError } from '/app/utils'; +import { handleError } from '../../../utils'; /** * Wraps a Meteor method into a Promise. diff --git a/app/ui-utils/client/lib/fireGlobalEvent.js b/app/ui-utils/client/lib/fireGlobalEvent.js index 49bdc67faf2..2b992660a31 100644 --- a/app/ui-utils/client/lib/fireGlobalEvent.js +++ b/app/ui-utils/client/lib/fireGlobalEvent.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; import { Tracker } from 'meteor/tracker'; export const fireGlobalEvent = function _fireGlobalEvent(eventName, params) { diff --git a/app/ui-utils/client/lib/menu.js b/app/ui-utils/client/lib/menu.js index b32613f8459..6bee4bd534d 100644 --- a/app/ui-utils/client/lib/menu.js +++ b/app/ui-utils/client/lib/menu.js @@ -1,8 +1,8 @@ import { Session } from 'meteor/session'; import _ from 'underscore'; import EventEmitter from 'wolfy87-eventemitter'; -import { lazyloadtick } from '/app/lazy-load'; -import { isRtl } from '/app/utils'; +import { lazyloadtick } from '../../../lazy-load'; +import { isRtl } from '../../../utils'; const sideNavW = 280; const map = (x, in_min, in_max, out_min, out_max) => (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; diff --git a/app/ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js index ff42f707be6..af2e9435913 100644 --- a/app/ui-utils/client/lib/modal.js +++ b/app/ui-utils/client/lib/modal.js @@ -2,7 +2,7 @@ import './modal.html'; import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -import { t, getUserPreference, handleError } from '/app/utils'; +import { t, getUserPreference, handleError } from '../../../utils'; export const modal = { renderedModal: null, diff --git a/app/ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js index 6cf976d2f49..4a02ff03904 100644 --- a/app/ui-utils/client/lib/openRoom.js +++ b/app/ui-utils/client/lib/openRoom.js @@ -6,10 +6,10 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { Session } from 'meteor/session'; import { Layout, RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from '..'; -import { ChatSubscription, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { roomTypes, handleError } from '/app/utils'; +import { ChatSubscription, Rooms } from '../../../models'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { roomTypes, handleError } from '../../../utils'; import _ from 'underscore'; window.currentTracker = undefined; diff --git a/app/ui-utils/client/lib/popout.js b/app/ui-utils/client/lib/popout.js index d931799941e..2b88d702e0a 100644 --- a/app/ui-utils/client/lib/popout.js +++ b/app/ui-utils/client/lib/popout.js @@ -2,7 +2,7 @@ import './popout.html'; import { Blaze } from 'meteor/blaze'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../../callbacks'; export const popout = { context: null, diff --git a/app/ui-utils/client/lib/popover.js b/app/ui-utils/client/lib/popover.js index 0cc90de0b8a..1bd698c7b45 100644 --- a/app/ui-utils/client/lib/popover.js +++ b/app/ui-utils/client/lib/popover.js @@ -4,8 +4,8 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { isRtl, handleError } from '/app/utils'; -import { ChatSubscription } from '/app/models'; +import { isRtl, handleError } from '../../../utils'; +import { ChatSubscription } from '../../../models'; import _ from 'underscore'; import { hide, leave } from './ChannelActions'; import { modal } from './modal'; diff --git a/app/ui-utils/client/lib/readMessages.js b/app/ui-utils/client/lib/readMessages.js index 4fd5aaffe7e..71d6e93d7f2 100644 --- a/app/ui-utils/client/lib/readMessages.js +++ b/app/ui-utils/client/lib/readMessages.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { ChatSubscription, ChatMessage } from '/app/models'; +import { ChatSubscription, ChatMessage } from '../../../models'; import { RoomHistoryManager } from './RoomHistoryManager'; import { RoomManager } from './RoomManager'; import _ from 'underscore'; diff --git a/app/ui-utils/client/lib/renderMessageBody.js b/app/ui-utils/client/lib/renderMessageBody.js index 7827a45113b..7ae8e6d583b 100644 --- a/app/ui-utils/client/lib/renderMessageBody.js +++ b/app/ui-utils/client/lib/renderMessageBody.js @@ -1,4 +1,4 @@ -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../../callbacks'; import s from 'underscore.string'; export const renderMessageBody = (message) => { diff --git a/app/ui-utils/lib/Message.js b/app/ui-utils/lib/Message.js index 539fd9819ee..91ab4501d3b 100644 --- a/app/ui-utils/lib/Message.js +++ b/app/ui-utils/lib/Message.js @@ -1,5 +1,5 @@ import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import s from 'underscore.string'; import { MessageTypes } from './MessageTypes'; diff --git a/app/ui-utils/lib/MessageProperties.js b/app/ui-utils/lib/MessageProperties.js index 8f18d046eaa..467215901bb 100644 --- a/app/ui-utils/lib/MessageProperties.js +++ b/app/ui-utils/lib/MessageProperties.js @@ -1,4 +1,4 @@ -import { emoji } from '/app/emoji'; +import { emoji } from '../../emoji'; import GraphemeSplitter from 'grapheme-splitter'; const splitter = new GraphemeSplitter(); diff --git a/app/ui-vrecord/client/VRecDialog.js b/app/ui-vrecord/client/VRecDialog.js index 48d06008883..5be1b0b15d0 100644 --- a/app/ui-vrecord/client/VRecDialog.js +++ b/app/ui-vrecord/client/VRecDialog.js @@ -1,6 +1,6 @@ import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -import { VideoRecorder } from '/app/ui'; +import { VideoRecorder } from '../../ui'; import _ from 'underscore'; export const VRecDialog = new class { diff --git a/app/ui-vrecord/client/vrecord.js b/app/ui-vrecord/client/vrecord.js index a2fd6942b2f..b998c8c0982 100644 --- a/app/ui-vrecord/client/vrecord.js +++ b/app/ui-vrecord/client/vrecord.js @@ -1,7 +1,7 @@ import { VRecDialog } from './VRecDialog'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; -import { VideoRecorder, fileUpload } from '/app/ui'; +import { VideoRecorder, fileUpload } from '../../ui'; Template.vrecDialog.helpers({ recordIcon() { diff --git a/app/ui-vrecord/server/settings.js b/app/ui-vrecord/server/settings.js index 77ea54f9a2a..829b5eb1e9c 100644 --- a/app/ui-vrecord/server/settings.js +++ b/app/ui-vrecord/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('Message', function() { this.add('Message_VideoRecorderEnabled', true, { diff --git a/app/ui/client/components/header/header.js b/app/ui/client/components/header/header.js index d30b03a3e3a..555755f677f 100644 --- a/app/ui/client/components/header/header.js +++ b/app/ui/client/components/header/header.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { TabBar, fireGlobalEvent } from '/app/ui-utils'; +import { TabBar, fireGlobalEvent } from '../../../../ui-utils'; Template.header.helpers({ back() { diff --git a/app/ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js index 1d545f64896..16f017c571b 100644 --- a/app/ui/client/components/header/headerRoom.js +++ b/app/ui/client/components/header/headerRoom.js @@ -3,15 +3,15 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { t, roomTypes, handleError } from '/app/utils'; -import { TabBar, fireGlobalEvent } from '/app/ui-utils'; -import { ChatSubscription, Rooms, ChatRoom } from '/app/models'; -import { settings } from '/app/settings'; +import { t, roomTypes, handleError } from '../../../../utils'; +import { TabBar, fireGlobalEvent } from '../../../../ui-utils'; +import { ChatSubscription, Rooms, ChatRoom } from '../../../../models'; +import { settings } from '../../../../settings'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { emoji } from '/app/emoji'; -import { Markdown } from '/app/markdown'; -import { hasAllPermission } from '/app/authorization'; -import { call } from '/app/ui-utils'; +import { emoji } from '../../../../emoji'; +import { Markdown } from '../../../../markdown'; +import { hasAllPermission } from '../../../../authorization'; +import { call } from '../../../../ui-utils'; const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0; diff --git a/app/ui/client/components/icon.js b/app/ui/client/components/icon.js index 9873061b1e1..b94f9c5ea1f 100644 --- a/app/ui/client/components/icon.js +++ b/app/ui/client/components/icon.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; -import { isChrome, isFirefox } from '/app/utils'; +import { isChrome, isFirefox } from '../../../utils'; const baseUrlFix = () => `${ document.baseURI }${ FlowRouter.current().path.substring(1) }`; diff --git a/app/ui/client/components/popupList.js b/app/ui/client/components/popupList.js index d742bcd8738..f97216305b0 100644 --- a/app/ui/client/components/popupList.js +++ b/app/ui/client/components/popupList.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.popupList.helpers({ config() { diff --git a/app/ui/client/lib/accounts.js b/app/ui/client/lib/accounts.js index 886c7e74b6c..6fccbb22708 100644 --- a/app/ui/client/lib/accounts.js +++ b/app/ui/client/lib/accounts.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { t } from '/app/utils'; +import { t } from '../../../utils'; import toastr from 'toastr'; Accounts.onEmailVerificationLink(function(token, done) { diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js index 9e368a518eb..8d781bd0db8 100644 --- a/app/ui/client/lib/chatMessages.js +++ b/app/ui/client/lib/chatMessages.js @@ -5,14 +5,14 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; -import { t, getUserPreference, slashCommands, handleError } from '/app/utils'; -import { MessageAction, messageProperties, MessageTypes, readMessage, modal } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { promises } from '/app/promises'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { Messages, Rooms, ChatMessage } from '/app/models'; -import { emoji } from '/app/emoji'; +import { t, getUserPreference, slashCommands, handleError } from '../../../utils'; +import { MessageAction, messageProperties, MessageTypes, readMessage, modal } from '../../../ui-utils'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; +import { promises } from '../../../promises'; +import { hasAtLeastOnePermission } from '../../../authorization'; +import { Messages, Rooms, ChatMessage } from '../../../models'; +import { emoji } from '../../../emoji'; import { KonchatNotification } from './notification'; import { MsgTyping } from './msgTyping'; import _ from 'underscore'; diff --git a/app/ui/client/lib/collections.js b/app/ui/client/lib/collections.js index 737fe5f22d6..9c53bec1dc0 100644 --- a/app/ui/client/lib/collections.js +++ b/app/ui/client/lib/collections.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; -import { CachedChatRoom, CachedChatSubscription } from '/app/models'; +import { settings } from '../../../settings'; +import { CachedChatRoom, CachedChatSubscription } from '../../../models'; Meteor.startup(() => { Tracker.autorun(() => { diff --git a/app/ui/client/lib/esc.js b/app/ui/client/lib/esc.js index d680a85a528..6015ac4d62e 100644 --- a/app/ui/client/lib/esc.js +++ b/app/ui/client/lib/esc.js @@ -1,4 +1,4 @@ -import { SideNav } from '/app/ui-utils'; +import { SideNav } from '../../../ui-utils'; import { VideoRecorder } from './recorderjs/videoRecorder'; const escapify = { @@ -40,7 +40,7 @@ const escapify = { }, async videoDialog() { - const { VRecDialog } = await import('/app/ui-vrecord'); + const { VRecDialog } = await import('../../../ui-vrecord'); const vrecDialog = document.querySelector('.vrec-dialog'); if (vrecDialog && Number(window.getComputedStyle(vrecDialog).opacity) === 1) { VideoRecorder.stop(); diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js index c0f2efe3e20..e0962e25325 100644 --- a/app/ui/client/lib/fileUpload.js +++ b/app/ui/client/lib/fileUpload.js @@ -4,10 +4,10 @@ import { Session } from 'meteor/session'; import s from 'underscore.string'; import { mountReply } from './chatMessages'; -import { fileUploadHandler } from '/app/file-upload'; +import { fileUploadHandler } from '../../../file-upload'; import { Handlebars } from 'meteor/ui'; -import { t, fileUploadIsValidContentType } from '/app/utils'; -import { modal } from '/app/ui-utils'; +import { t, fileUploadIsValidContentType } from '../../../utils'; +import { modal } from '../../../ui-utils'; const readAsDataURL = (file, callback) => { diff --git a/app/ui/client/lib/iframeCommands.js b/app/ui/client/lib/iframeCommands.js index f65f80ef18f..facd647d60b 100644 --- a/app/ui/client/lib/iframeCommands.js +++ b/app/ui/client/lib/iframeCommands.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { AccountBox } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { AccountBox } from '../../../ui-utils'; +import { settings } from '../../../settings'; +import { callbacks } from '../../../callbacks'; import s from 'underscore.string'; const commands = { diff --git a/app/ui/client/lib/menu.js b/app/ui/client/lib/menu.js index a3462c5132f..732fc661364 100644 --- a/app/ui/client/lib/menu.js +++ b/app/ui/client/lib/menu.js @@ -1,5 +1,5 @@ import _ from 'underscore'; -import { menu } from '/app/ui-utils'; +import { menu } from '../../../ui-utils'; import EventEmitter from 'wolfy87-eventemitter'; const emitter = new EventEmitter(); diff --git a/app/ui/client/lib/msgTyping.js b/app/ui/client/lib/msgTyping.js index 33554187f59..28c4a09af94 100644 --- a/app/ui/client/lib/msgTyping.js +++ b/app/ui/client/lib/msgTyping.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { settings } from '../../../settings'; +import { Notifications } from '../../../notifications'; import _ from 'underscore'; export const MsgTyping = (function() { diff --git a/app/ui/client/lib/notification.js b/app/ui/client/lib/notification.js index 93000a7f1f7..4dd68d85174 100644 --- a/app/ui/client/lib/notification.js +++ b/app/ui/client/lib/notification.js @@ -7,12 +7,12 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import _ from 'underscore'; import s from 'underscore.string'; -import { e2e } from '/app/e2e'; -import { Users, ChatSubscription } from '/app/models'; -import { getUserPreference } from '/app/utils'; -import { getAvatarUrlFromUsername } from '/app/utils'; -import { getAvatarAsPng } from '/app/ui-utils'; -import { promises } from '/app/promises'; +import { e2e } from '../../../e2e'; +import { Users, ChatSubscription } from '../../../models'; +import { getUserPreference } from '../../../utils'; +import { getAvatarUrlFromUsername } from '../../../utils'; +import { getAvatarAsPng } from '../../../ui-utils'; +import { promises } from '../../../promises'; export const KonchatNotification = { notificationStatus: new ReactiveVar, diff --git a/app/ui/client/lib/recorderjs/audioEncoder.js b/app/ui/client/lib/recorderjs/audioEncoder.js index c9055a26593..8edadb12d46 100644 --- a/app/ui/client/lib/recorderjs/audioEncoder.js +++ b/app/ui/client/lib/recorderjs/audioEncoder.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import EventEmitter from 'wolfy87-eventemitter'; class AudioEncoder extends EventEmitter { diff --git a/app/ui/client/views/app/burger.js b/app/ui/client/views/app/burger.js index 2077bfbced9..4fbbc2f45ac 100644 --- a/app/ui/client/views/app/burger.js +++ b/app/ui/client/views/app/burger.js @@ -1,6 +1,6 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { Layout } from '/app/ui-utils'; +import { Layout } from '../../../../ui-utils'; Template.burger.helpers({ unread() { diff --git a/app/ui/client/views/app/createChannel.js b/app/ui/client/views/app/createChannel.js index a88265374a2..ab97dabaddc 100644 --- a/app/ui/client/views/app/createChannel.js +++ b/app/ui/client/views/app/createChannel.js @@ -5,10 +5,10 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { t, roomTypes } from '/app/utils'; -import { hasAllPermission } from '/app/authorization'; +import { settings } from '../../../../settings'; +import { callbacks } from '../../../../callbacks'; +import { t, roomTypes } from '../../../../utils'; +import { hasAllPermission } from '../../../../authorization'; import toastr from 'toastr'; import _ from 'underscore'; diff --git a/app/ui/client/views/app/directory.js b/app/ui/client/views/app/directory.js index 8aba10e60ff..34bdb559dd3 100644 --- a/app/ui/client/views/app/directory.js +++ b/app/ui/client/views/app/directory.js @@ -4,9 +4,9 @@ import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; import _ from 'underscore'; import { timeAgo } from './helpers'; -import { t, roomTypes } from '/app/utils'; -import { settings } from '/app/settings'; -import { hasAtLeastOnePermission } from '/app/authorization'; +import { t, roomTypes } from '../../../../utils'; +import { settings } from '../../../../settings'; +import { hasAtLeastOnePermission } from '../../../../authorization'; function directorySearch(config, cb) { return Meteor.call('browseChannels', config, (err, result) => { diff --git a/app/ui/client/views/app/home.js b/app/ui/client/views/app/home.js index e2caaf5217a..7f51fd7d92e 100644 --- a/app/ui/client/views/app/home.js +++ b/app/ui/client/views/app/home.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; Template.home.helpers({ title() { diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js index ac8b1594969..2b3a3cd75b4 100644 --- a/app/ui/client/views/app/room.js +++ b/app/ui/client/views/app/room.js @@ -6,9 +6,9 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { t, roomTypes, getUserPreference, handleError } from '/app/utils'; -import { WebRTC } from '/app/webrtc'; -import { ChatSubscription, ChatMessage, RoomRoles, Users, Subscriptions, Rooms } from '/app/models'; +import { t, roomTypes, getUserPreference, handleError } from '../../../../utils'; +import { WebRTC } from '../../../../webrtc'; +import { ChatSubscription, ChatMessage, RoomRoles, Users, Subscriptions, Rooms } from '../../../../models'; import { fireGlobalEvent, RoomHistoryManager, @@ -19,16 +19,16 @@ import { Layout, MessageAction, RocketChatTabBar, -} from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { promises } from '/app/promises'; -import { hasAllPermission, hasRole } from '/app/authorization'; +} from '../../../../ui-utils'; +import { settings } from '../../../../settings'; +import { callbacks } from '../../../../callbacks'; +import { promises } from '../../../../promises'; +import { hasAllPermission, hasRole } from '../../../../authorization'; import _ from 'underscore'; import moment from 'moment'; import mime from 'mime-type/with-db'; import Clipboard from 'clipboard'; -import { lazyloadtick } from '/app/lazy-load'; +import { lazyloadtick } from '../../../../lazy-load'; import { ChatMessages } from '../../lib/chatMessages'; import { fileUpload } from '../../lib/fileUpload'; diff --git a/app/ui/client/views/app/roomSearch.js b/app/ui/client/views/app/roomSearch.js index a27cd42e697..c77fb4c736a 100644 --- a/app/ui/client/views/app/roomSearch.js +++ b/app/ui/client/views/app/roomSearch.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { roomTypes } from '/app/utils'; +import { roomTypes } from '../../../../utils'; Template.roomSearch.helpers({ roomIcon() { diff --git a/app/ui/client/views/app/secretURL.js b/app/ui/client/views/app/secretURL.js index fae9fcdf27f..6adc7baca6e 100644 --- a/app/ui/client/views/app/secretURL.js +++ b/app/ui/client/views/app/secretURL.js @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../../settings'; import { KonchatNotification } from '../../lib/notification'; Template.secretURL.helpers({ diff --git a/app/ui/client/views/app/videoCall/videoButtons.js b/app/ui/client/views/app/videoCall/videoButtons.js index 5e1b1ae56e6..5e5c15e3fa2 100644 --- a/app/ui/client/views/app/videoCall/videoButtons.js +++ b/app/ui/client/views/app/videoCall/videoButtons.js @@ -1,6 +1,6 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { WebRTC } from '/app/webrtc'; +import { WebRTC } from '../../../../../webrtc'; Template.videoButtons.helpers({ videoAvaliable() { diff --git a/app/ui/client/views/app/videoCall/videoCall.js b/app/ui/client/views/app/videoCall/videoCall.js index 84329b4ff3e..72d920a647e 100644 --- a/app/ui/client/views/app/videoCall/videoCall.js +++ b/app/ui/client/views/app/videoCall/videoCall.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { t } from '/app/utils'; -import { WebRTC } from '/app/webrtc'; +import { t } from '../../../../../utils'; +import { WebRTC } from '../../../../../webrtc'; Template.videoCall.onCreated(function() { return this.mainVideo = new ReactiveVar('$auto'); diff --git a/app/ui/client/views/cmsPage.js b/app/ui/client/views/cmsPage.js index 3f94bf457d7..39558923caa 100644 --- a/app/ui/client/views/cmsPage.js +++ b/app/ui/client/views/cmsPage.js @@ -3,7 +3,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; Template.cmsPage.onCreated(function() { this.page = new ReactiveVar(''); diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js index d55de3f95f8..a903827fe2d 100644 --- a/app/user-data-download/server/cronProcessDownloads.js +++ b/app/user-data-download/server/cronProcessDownloads.js @@ -1,13 +1,13 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { Subscriptions, Rooms, Users, Uploads, Messages, UserDataFiles, ExportOperations } from '/app/models'; -import { FileUpload } from '/app/file-upload'; +import { settings } from '../../settings'; +import { Subscriptions, Rooms, Users, Uploads, Messages, UserDataFiles, ExportOperations } from '../../models'; +import { FileUpload } from '../../file-upload'; import { SyncedCron } from 'meteor/littledata:synced-cron'; import fs from 'fs'; import path from 'path'; import archiver from 'archiver'; -import * as Mailer from '/app/mailer'; +import * as Mailer from '../../mailer'; let zipFolder = '/tmp/zipFiles'; if (settings.get('UserData_FileSystemZipPath') != null) { diff --git a/app/user-data-download/server/startup/settings.js b/app/user-data-download/server/startup/settings.js index 13c9c0cfafb..fb13e50988a 100644 --- a/app/user-data-download/server/startup/settings.js +++ b/app/user-data-download/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('UserDataDownload', function() { diff --git a/app/utils/client/lib/CustomTranslations.js b/app/utils/client/lib/CustomTranslations.js index c3836853f97..ab17aa85cd1 100644 --- a/app/utils/client/lib/CustomTranslations.js +++ b/app/utils/client/lib/CustomTranslations.js @@ -1,5 +1,5 @@ import { TAPi18n, TAPi18next } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; export function applyCustomTranslations() { let CustomTranslations = settings.get('Custom_Translations'); diff --git a/app/utils/client/lib/roomTypes.js b/app/utils/client/lib/roomTypes.js index 5cb307543ff..0237a0a66ca 100644 --- a/app/utils/client/lib/roomTypes.js +++ b/app/utils/client/lib/roomTypes.js @@ -1,6 +1,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { RoomTypesCommon } from '../../lib/RoomTypesCommon'; -import { ChatRoom, ChatSubscription, RoomRoles } from '/app/models'; +import { ChatRoom, ChatSubscription, RoomRoles } from '../../../models'; import _ from 'underscore'; export const roomTypes = new class RocketChatRoomTypes extends RoomTypesCommon { diff --git a/app/utils/lib/RoomTypeConfig.js b/app/utils/lib/RoomTypeConfig.js index 34a03ac11a2..001467dfe73 100644 --- a/app/utils/lib/RoomTypeConfig.js +++ b/app/utils/lib/RoomTypeConfig.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Users } from '../../models'; +import { settings } from '../../settings'; export const RoomSettingsEnum = { NAME: 'roomName', diff --git a/app/utils/lib/fileUploadRestrictions.js b/app/utils/lib/fileUploadRestrictions.js index 302ed21d073..576eee8ebe7 100644 --- a/app/utils/lib/fileUploadRestrictions.js +++ b/app/utils/lib/fileUploadRestrictions.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import _ from 'underscore'; export const fileUploadMediaWhiteList = function() { diff --git a/app/utils/lib/getAvatarUrlFromUsername.js b/app/utils/lib/getAvatarUrlFromUsername.js index 911388cae93..c0416da5cda 100644 --- a/app/utils/lib/getAvatarUrlFromUsername.js +++ b/app/utils/lib/getAvatarUrlFromUsername.js @@ -1,5 +1,5 @@ import { Session } from 'meteor/session'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; export const getAvatarUrlFromUsername = function(username) { const externalSource = (settings.get('Accounts_AvatarExternalProviderUrl') || '').trim().replace(/\/$/, ''); diff --git a/app/utils/lib/getURL.js b/app/utils/lib/getURL.js index 362a36237f8..08bfc55a72e 100644 --- a/app/utils/lib/getURL.js +++ b/app/utils/lib/getURL.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import s from 'underscore.string'; export const getURL = (path, { cdn = true, full = false } = {}) => { diff --git a/app/utils/lib/getUserNotificationPreference.js b/app/utils/lib/getUserNotificationPreference.js index 3be312e4010..9d5e5ac1018 100644 --- a/app/utils/lib/getUserNotificationPreference.js +++ b/app/utils/lib/getUserNotificationPreference.js @@ -1,5 +1,5 @@ -import { settings } from '/app/settings'; -import { Users } from '/app/models'; +import { settings } from '../../settings'; +import { Users } from '../../models'; export const getUserNotificationPreference = (user, pref) => { if (typeof user === 'string') { diff --git a/app/utils/lib/getUserPreference.js b/app/utils/lib/getUserPreference.js index ede554ffbcf..c9785eb34e8 100644 --- a/app/utils/lib/getUserPreference.js +++ b/app/utils/lib/getUserPreference.js @@ -1,5 +1,5 @@ -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Users } from '../../models'; +import { settings } from '../../settings'; export const getUserPreference = (user, key, defaultValue = undefined) => { let preference; diff --git a/app/utils/lib/getValidRoomName.js b/app/utils/lib/getValidRoomName.js index 65dce62176a..5436d7d5cac 100644 --- a/app/utils/lib/getValidRoomName.js +++ b/app/utils/lib/getValidRoomName.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import limax from 'limax'; -import { settings } from '/app/settings'; -import { Rooms } from '/app/models'; +import { settings } from '../../settings'; +import { Rooms } from '../../models'; export const getValidRoomName = (displayName, rid = '', options = {}) => { let slugifiedName = displayName; diff --git a/app/utils/lib/placeholders.js b/app/utils/lib/placeholders.js index 12c37810518..b68db8eddb7 100644 --- a/app/utils/lib/placeholders.js +++ b/app/utils/lib/placeholders.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import s from 'underscore.string'; export const placeholders = { diff --git a/app/utils/lib/roomExit.js b/app/utils/lib/roomExit.js index 98cc2b200b9..ada0fe375ea 100644 --- a/app/utils/lib/roomExit.js +++ b/app/utils/lib/roomExit.js @@ -1,6 +1,6 @@ import { Blaze } from 'meteor/blaze'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../callbacks'; export const roomExit = function() { // 7370 - Close flex-tab when opening a room on mobile UI diff --git a/app/utils/lib/templateVarHandler.js b/app/utils/lib/templateVarHandler.js index e13b1a7a100..c384da3970c 100644 --- a/app/utils/lib/templateVarHandler.js +++ b/app/utils/lib/templateVarHandler.js @@ -4,7 +4,7 @@ let logger; if (Meteor.isServer) { Meteor.startup(async() => { - const { Logger } = await import('/app/logger'); + const { Logger } = await import('../../logger'); logger = new Logger('TemplateVarHandler', {}); }); } diff --git a/app/utils/server/lib/composeMessageObjectWithUser.js b/app/utils/server/lib/composeMessageObjectWithUser.js index 58dc72e6e1e..3cf88b88ae0 100644 --- a/app/utils/server/lib/composeMessageObjectWithUser.js +++ b/app/utils/server/lib/composeMessageObjectWithUser.js @@ -1,5 +1,5 @@ -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Users } from '../../../models'; +import { settings } from '../../../settings'; const getUser = (userId) => Users.findOneById(userId); diff --git a/app/version-check/client/client.js b/app/version-check/client/client.js index 7eb58ae8c25..51282acc7cb 100644 --- a/app/version-check/client/client.js +++ b/app/version-check/client/client.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { TAPi18n } from 'meteor/tap:i18n'; -import { alerts } from '/app/ui-utils'; +import { alerts } from '../../ui-utils'; Meteor.startup(function() { Tracker.autorun(() => { diff --git a/app/version-check/server/addSettings.js b/app/version-check/server/addSettings.js index 89ee990d466..4dc74aee2c9 100644 --- a/app/version-check/server/addSettings.js +++ b/app/version-check/server/addSettings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('General', function() { this.section('Update', function() { diff --git a/app/version-check/server/functions/checkVersionUpdate.js b/app/version-check/server/functions/checkVersionUpdate.js index 573db9cbe2b..b775e1e9397 100644 --- a/app/version-check/server/functions/checkVersionUpdate.js +++ b/app/version-check/server/functions/checkVersionUpdate.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; -import { Info } from '/app/utils'; -import { Roles, Users } from '/app/models'; +import { settings } from '../../../settings'; +import { Info } from '../../../utils'; +import { Roles, Users } from '../../../models'; import semver from 'semver'; import logger from '../logger'; import getNewUpdates from './getNewUpdates'; diff --git a/app/version-check/server/functions/getNewUpdates.js b/app/version-check/server/functions/getNewUpdates.js index 3574084f2b1..5cb1ac49e27 100644 --- a/app/version-check/server/functions/getNewUpdates.js +++ b/app/version-check/server/functions/getNewUpdates.js @@ -1,9 +1,9 @@ import os from 'os'; import { HTTP } from 'meteor/http'; -import { Settings } from '/app/models'; -import { settings } from '/app/settings'; -import { Info } from '/app/utils'; -import { getWorkspaceAccessToken } from '/app/cloud'; +import { Settings } from '../../../models'; +import { settings } from '../../../settings'; +import { Info } from '../../../utils'; +import { getWorkspaceAccessToken } from '../../../cloud'; import { MongoInternals } from 'meteor/mongo'; export default () => { diff --git a/app/version-check/server/logger.js b/app/version-check/server/logger.js index 6b4a40c47bd..d45a56a597a 100644 --- a/app/version-check/server/logger.js +++ b/app/version-check/server/logger.js @@ -1,3 +1,3 @@ -import { Logger } from '/app/logger'; +import { Logger } from '../../logger'; export default new Logger('VersionCheck'); diff --git a/app/version-check/server/methods/banner_dismiss.js b/app/version-check/server/methods/banner_dismiss.js index 10661bee7b5..9eac456984b 100644 --- a/app/version-check/server/methods/banner_dismiss.js +++ b/app/version-check/server/methods/banner_dismiss.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../../models'; Meteor.methods({ 'banner/dismiss'({ id }) { diff --git a/app/videobridge/client/actionLink.js b/app/videobridge/client/actionLink.js index 881111dcf74..8adeb233ac0 100644 --- a/app/videobridge/client/actionLink.js +++ b/app/videobridge/client/actionLink.js @@ -1,7 +1,7 @@ import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; -import { actionLinks } from '/app/action-links'; -import { Rooms } from '/app/models'; +import { actionLinks } from '../../action-links'; +import { Rooms } from '../../models'; import toastr from 'toastr'; actionLinks.register('joinJitsiCall', function(message, params, instance) { diff --git a/app/videobridge/client/tabBar.js b/app/videobridge/client/tabBar.js index cecd45b608c..42345646868 100644 --- a/app/videobridge/client/tabBar.js +++ b/app/videobridge/client/tabBar.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; -import { settings } from '/app/settings'; -import { TabBar } from '/app/ui-utils'; -import { Rooms } from '/app/models'; +import { settings } from '../../settings'; +import { TabBar } from '../../ui-utils'; +import { Rooms } from '../../models'; Meteor.startup(function() { diff --git a/app/videobridge/client/views/videoFlexTab.js b/app/videobridge/client/views/videoFlexTab.js index 6707391a76f..d1c1dc097f5 100644 --- a/app/videobridge/client/views/videoFlexTab.js +++ b/app/videobridge/client/views/videoFlexTab.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { modal, TabBar } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { settings } from '../../../settings'; +import { modal, TabBar } from '../../../ui-utils'; +import { t } from '../../../utils'; Template.videoFlexTab.helpers({ openInNewWindow() { diff --git a/app/videobridge/client/views/videoFlexTabBbb.js b/app/videobridge/client/views/videoFlexTabBbb.js index d5c06a65c56..d7ce80ec454 100644 --- a/app/videobridge/client/views/videoFlexTabBbb.js +++ b/app/videobridge/client/views/videoFlexTabBbb.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; -import { Rooms } from '/app/models'; -import { hasAllPermission } from '/app/authorization'; -import { popout } from '/app/ui-utils'; +import { settings } from '../../../settings'; +import { Rooms } from '../../../models'; +import { hasAllPermission } from '../../../authorization'; +import { popout } from '../../../ui-utils'; Template.videoFlexTabBbb.helpers({ openInNewWindow() { diff --git a/app/videobridge/lib/messageType.js b/app/videobridge/lib/messageType.js index 144023c7771..0d97b899553 100644 --- a/app/videobridge/lib/messageType.js +++ b/app/videobridge/lib/messageType.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { MessageTypes } from '/app/ui-utils'; +import { MessageTypes } from '../../ui-utils'; Meteor.startup(function() { MessageTypes.registerType({ diff --git a/app/videobridge/server/actionLink.js b/app/videobridge/server/actionLink.js index 2d0cda195cc..01d5baa2ff4 100644 --- a/app/videobridge/server/actionLink.js +++ b/app/videobridge/server/actionLink.js @@ -1,4 +1,4 @@ -import { actionLinks } from '/app/action-links'; +import { actionLinks } from '../../action-links'; actionLinks.register('joinJitsiCall', function(/* message, params*/) { diff --git a/app/videobridge/server/methods/bbb.js b/app/videobridge/server/methods/bbb.js index 83469aad3d0..8f7a708cdee 100644 --- a/app/videobridge/server/methods/bbb.js +++ b/app/videobridge/server/methods/bbb.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import BigBlueButtonApi from '/app/bigbluebutton'; -import { settings } from '/app/settings'; -import { Rooms, Users } from '/app/models'; -import { saveStreamingOptions } from '/app/channel-settings'; -import { API } from '/app/api'; +import BigBlueButtonApi from '../../../bigbluebutton'; +import { settings } from '../../../settings'; +import { Rooms, Users } from '../../../models'; +import { saveStreamingOptions } from '../../../channel-settings'; +import { API } from '../../../api'; import { HTTP } from 'meteor/http'; import xml2js from 'xml2js'; diff --git a/app/videobridge/server/methods/jitsiSetTimeout.js b/app/videobridge/server/methods/jitsiSetTimeout.js index 3dde6458a41..4b1c4c22017 100644 --- a/app/videobridge/server/methods/jitsiSetTimeout.js +++ b/app/videobridge/server/methods/jitsiSetTimeout.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { TAPi18n } from 'meteor/tap:i18n'; -import { Rooms, Messages } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Messages } from '../../../models'; +import { callbacks } from '../../../callbacks'; Meteor.methods({ 'jitsi:updateTimeout': (rid) => { diff --git a/app/videobridge/server/settings.js b/app/videobridge/server/settings.js index 819e9b8305c..60c68517308 100644 --- a/app/videobridge/server/settings.js +++ b/app/videobridge/server/settings.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; Meteor.startup(function() { settings.addGroup('Video Conference', function() { diff --git a/app/webdav/client/actionButton.js b/app/webdav/client/actionButton.js index 8ca5a4732c0..1463efd1560 100644 --- a/app/webdav/client/actionButton.js +++ b/app/webdav/client/actionButton.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { t, getURL } from '/app/utils'; -import { Subscriptions, WebdavAccounts } from '/app/models'; -import { settings } from '/app/settings'; -import { MessageAction, modal } from '/app/ui-utils'; +import { t, getURL } from '../../utils'; +import { Subscriptions, WebdavAccounts } from '../../models'; +import { settings } from '../../settings'; +import { MessageAction, modal } from '../../ui-utils'; Meteor.startup(function() { diff --git a/app/webdav/client/addWebdavAccount.js b/app/webdav/client/addWebdavAccount.js index f4aa18ddc4d..1d7bcb3c067 100644 --- a/app/webdav/client/addWebdavAccount.js +++ b/app/webdav/client/addWebdavAccount.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { modal } from '/app/ui-utils'; -import { t } from '/app/utils'; +import { modal } from '../../ui-utils'; +import { t } from '../../utils'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/app/webdav/client/selectWebdavAccount.js b/app/webdav/client/selectWebdavAccount.js index 8eb82b74dba..d94fddf1f54 100644 --- a/app/webdav/client/selectWebdavAccount.js +++ b/app/webdav/client/selectWebdavAccount.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import toastr from 'toastr'; -import { modal } from '/app/ui-utils'; -import { t } from '/app/utils'; -import { WebdavAccounts } from '/app/models'; +import { modal } from '../../ui-utils'; +import { t } from '../../utils'; +import { WebdavAccounts } from '../../models'; Template.selectWebdavAccount.helpers({ webdavAccounts() { diff --git a/app/webdav/client/startup/messageBoxActions.js b/app/webdav/client/startup/messageBoxActions.js index 7b41c698dce..95d60169787 100644 --- a/app/webdav/client/startup/messageBoxActions.js +++ b/app/webdav/client/startup/messageBoxActions.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { t } from '/app/utils'; -import { settings } from '/app/settings'; -import { messageBox, modal } from '/app/ui-utils'; -import { WebdavAccounts } from '/app/models'; +import { t } from '../../../utils'; +import { settings } from '../../../settings'; +import { messageBox, modal } from '../../../ui-utils'; +import { WebdavAccounts } from '../../../models'; messageBox.actions.add('WebDAV', 'Add Server', { id: 'add-webdav', diff --git a/app/webdav/client/webdavFilePicker.js b/app/webdav/client/webdavFilePicker.js index 5d547793d15..5484e683d40 100644 --- a/app/webdav/client/webdavFilePicker.js +++ b/app/webdav/client/webdavFilePicker.js @@ -3,9 +3,9 @@ import { Template } from 'meteor/templating'; import _ from 'underscore'; import toastr from 'toastr'; import { Session } from 'meteor/session'; -import { modal, call } from '/app/ui-utils'; -import { t } from '/app/utils'; -import { fileUploadHandler } from '/app/file-upload'; +import { modal, call } from '../../ui-utils'; +import { t } from '../../utils'; +import { fileUploadHandler } from '../../file-upload'; import { Handlebars } from 'meteor/ui'; Template.webdavFilePicker.rendered = async function() { diff --git a/app/webdav/server/methods/addWebdavAccount.js b/app/webdav/server/methods/addWebdavAccount.js index 2c062e7c501..60ac0fd2e69 100644 --- a/app/webdav/server/methods/addWebdavAccount.js +++ b/app/webdav/server/methods/addWebdavAccount.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { WebdavAccounts } from '/app/models'; +import { settings } from '../../../settings'; +import { WebdavAccounts } from '../../../models'; import { createClient } from 'webdav'; Meteor.methods({ diff --git a/app/webdav/server/methods/getFileFromWebdav.js b/app/webdav/server/methods/getFileFromWebdav.js index 1801702b13c..c5d417da38e 100644 --- a/app/webdav/server/methods/getFileFromWebdav.js +++ b/app/webdav/server/methods/getFileFromWebdav.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { WebdavAccounts } from '/app/models'; +import { settings } from '../../../settings'; +import { WebdavAccounts } from '../../../models'; import { createClient } from 'webdav'; Meteor.methods({ diff --git a/app/webdav/server/methods/getWebdavFileList.js b/app/webdav/server/methods/getWebdavFileList.js index 9c433cf7832..a637abd612a 100644 --- a/app/webdav/server/methods/getWebdavFileList.js +++ b/app/webdav/server/methods/getWebdavFileList.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { WebdavAccounts } from '/app/models'; +import { settings } from '../../../settings'; +import { WebdavAccounts } from '../../../models'; import { createClient } from 'webdav'; Meteor.methods({ diff --git a/app/webdav/server/methods/removeWebdavAccount.js b/app/webdav/server/methods/removeWebdavAccount.js index ec777533c05..cf461ae8e8d 100644 --- a/app/webdav/server/methods/removeWebdavAccount.js +++ b/app/webdav/server/methods/removeWebdavAccount.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { WebdavAccounts } from '/app/models'; +import { WebdavAccounts } from '../../../models'; Meteor.methods({ removeWebdavAccount(accountId) { diff --git a/app/webdav/server/methods/uploadFileToWebdav.js b/app/webdav/server/methods/uploadFileToWebdav.js index a9199dab742..a6f5f776850 100644 --- a/app/webdav/server/methods/uploadFileToWebdav.js +++ b/app/webdav/server/methods/uploadFileToWebdav.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { settings } from '/app/settings'; -import { WebdavAccounts } from '/app/models'; +import { settings } from '../../../settings'; +import { WebdavAccounts } from '../../../models'; import Future from 'fibers/future'; import { createClient } from 'webdav'; import stream from 'stream'; diff --git a/app/webdav/server/publications/webdavAccounts.js b/app/webdav/server/publications/webdavAccounts.js index 1efcbb74140..b67c8b303a3 100644 --- a/app/webdav/server/publications/webdavAccounts.js +++ b/app/webdav/server/publications/webdavAccounts.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { WebdavAccounts } from '/app/models'; +import { WebdavAccounts } from '../../../models'; Meteor.publish('webdavAccounts', function() { if (!this.userId) { diff --git a/app/webdav/server/startup/settings.js b/app/webdav/server/startup/settings.js index 23afe8fc36e..bd8cefe2185 100644 --- a/app/webdav/server/startup/settings.js +++ b/app/webdav/server/startup/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../settings'; settings.addGroup('Webdav Integration', function() { this.add('Webdav_Integration_Enabled', false, { diff --git a/app/webrtc/client/WebRTCClass.js b/app/webrtc/client/WebRTCClass.js index 8a95e7e3fa3..3bef0bcd60f 100644 --- a/app/webrtc/client/WebRTCClass.js +++ b/app/webrtc/client/WebRTCClass.js @@ -3,12 +3,12 @@ import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router' ; import { TAPi18n } from 'meteor/tap:i18n'; -import { t } from '/app/utils'; +import { t } from '../../utils'; import { ChromeScreenShare } from './screenShare'; -import { Notifications } from '/app/notifications'; -import { settings } from '/app/settings'; -import { modal } from '/app/ui-utils'; -import { ChatSubscription } from '/app/models'; +import { Notifications } from '../../notifications'; +import { settings } from '../../settings'; +import { modal } from '../../ui-utils'; +import { ChatSubscription } from '../../models'; class WebRTCTransportClass { constructor(webrtcInstance) { diff --git a/app/webrtc/client/screenShare.js b/app/webrtc/client/screenShare.js index 0ca18e3702a..66f14ed9579 100644 --- a/app/webrtc/client/screenShare.js +++ b/app/webrtc/client/screenShare.js @@ -1,4 +1,4 @@ -import { fireGlobalEvent } from '/app/ui-utils'; +import { fireGlobalEvent } from '../../ui-utils'; export const ChromeScreenShare = { callbacks: {}, diff --git a/app/webrtc/server/settings.js b/app/webrtc/server/settings.js index 1fe8c9a9bfd..0d5bea7c792 100644 --- a/app/webrtc/server/settings.js +++ b/app/webrtc/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('WebRTC', function() { this.add('WebRTC_Enable_Channel', false, { diff --git a/app/wordpress/lib/common.js b/app/wordpress/lib/common.js index 7bbae47cb13..64970d07704 100644 --- a/app/wordpress/lib/common.js +++ b/app/wordpress/lib/common.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { settings } from '/app/settings'; +import { settings } from '../../settings'; import { ServiceConfiguration } from 'meteor/service-configuration'; -import { CustomOAuth } from '/app/custom-oauth'; +import { CustomOAuth } from '../../custom-oauth'; import _ from 'underscore'; const config = { diff --git a/app/wordpress/server/startup.js b/app/wordpress/server/startup.js index 5eda1e94bef..b239d6d0a5a 100644 --- a/app/wordpress/server/startup.js +++ b/app/wordpress/server/startup.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../settings'; settings.addGroup('OAuth', function() { return this.section('WordPress', function() { diff --git a/client/importPackages.js b/client/importPackages.js index 71d9a6e4209..d376a181e72 100644 --- a/client/importPackages.js +++ b/client/importPackages.js @@ -1,111 +1,111 @@ -import '/app/cors'; -import '/app/2fa'; -import '/app/analytics'; -import '/app/authorization'; -import '/app/autolinker'; -import '/app/autotranslate'; -import '/app/cas'; -import '/app/channel-settings'; -import '/app/channel-settings-mail-messages'; -import '/app/cloud'; -import '/app/colors'; -import '/app/crowd'; -import '/app/custom-oauth'; -import '/app/custom-sounds'; -import '/app/dolphin'; -import '/app/drupal'; -import '/app/emoji'; -import '/app/emoji-custom'; -import '/app/emoji-emojione'; -import '/app/favico'; -import '/app/federation'; -import '/app/file-upload'; -import '/app/github-enterprise'; -import '/app/gitlab'; -import '/app/google-vision'; -import '/app/highlight-words'; -import '/app/iframe-login'; -import '/app/importer'; -import '/app/importer-csv'; -import '/app/importer-hipchat'; -import '/app/importer-hipchat-enterprise'; -import '/app/importer-slack'; -import '/app/importer-slack-users'; -import '/app/integrations'; -import '/app/issuelinks'; -import '/app/katex'; -import '/app/ldap'; -import '/app/lib'; -import '/app/livestream'; -import '/app/logger'; -import '/app/token-login'; -import '/app/mapview'; -import '/app/markdown'; -import '/app/mentions'; -import '/app/mentions-flextab'; -import '/app/message-action'; -import '/app/message-attachments'; -import '/app/message-mark-as-unread'; -import '/app/message-pin'; -import '/app/message-snippet'; -import '/app/message-star'; -import '/app/oauth2-server-config'; -import '/app/oembed'; -import '/app/otr'; -import '/app/push-notifications'; -import '/app/apps'; -import '/app/sandstorm'; -import '/app/setup-wizard'; -import '/app/slackbridge'; -import '/app/slashcommands-archiveroom'; -import '/app/slashcommand-asciiarts'; -import '/app/slashcommands-create'; -import '/app/slashcommands-hide'; -import '/app/slashcommands-invite'; -import '/app/slashcommands-inviteall'; -import '/app/slashcommands-join'; -import '/app/slashcommands-kick'; -import '/app/slashcommands-open'; -import '/app/slashcommands-topic'; -import '/app/slashcommands-unarchiveroom'; -import '/app/slider'; -import '/app/spotify'; -import '/app/statistics'; -import '/app/theme'; -import '/app/tokenpass'; -import '/app/tooltip'; -import '/app/ui'; -import '/app/ui-account'; -import '/app/ui-admin'; -import '/app/ui-clean-history'; -import '/app/ui-flextab'; -import '/app/ui-login'; -import '/app/ui-master'; -import '/app/ui-message'; -import '/app/ui-sidenav'; -import '/app/ui-vrecord'; -import '/app/videobridge'; -import '/app/webdav'; -import '/app/webrtc'; -import '/app/wordpress'; -import '/app/nrr'; -import '/app/meteor-accounts-saml'; -import '/app/e2e'; -import '/app/blockstack'; -import '/app/version-check'; -import '/app/search'; -import '/app/chatpal-search'; -import '/app/lazy-load'; -import '/app/threading'; -import '/app/mail-messages'; -import '/app/utils'; -import '/app/settings'; -import '/app/models'; -import '/app/callbacks'; -import '/app/notifications'; -import '/app/promises'; -import '/app/ui-utils'; -import '/app/ui-cached-collection'; -import '/app/action-links'; -import '/app/reactions'; -import '/app/livechat'; +import '../app/cors'; +import '../app/2fa'; +import '../app/analytics'; +import '../app/authorization'; +import '../app/autolinker'; +import '../app/autotranslate'; +import '../app/cas'; +import '../app/channel-settings'; +import '../app/channel-settings-mail-messages'; +import '../app/cloud'; +import '../app/colors'; +import '../app/crowd'; +import '../app/custom-oauth'; +import '../app/custom-sounds'; +import '../app/dolphin'; +import '../app/drupal'; +import '../app/emoji'; +import '../app/emoji-custom'; +import '../app/emoji-emojione'; +import '../app/favico'; +import '../app/federation'; +import '../app/file-upload'; +import '../app/github-enterprise'; +import '../app/gitlab'; +import '../app/google-vision'; +import '../app/highlight-words'; +import '../app/iframe-login'; +import '../app/importer'; +import '../app/importer-csv'; +import '../app/importer-hipchat'; +import '../app/importer-hipchat-enterprise'; +import '../app/importer-slack'; +import '../app/importer-slack-users'; +import '../app/integrations'; +import '../app/issuelinks'; +import '../app/katex'; +import '../app/ldap'; +import '../app/lib'; +import '../app/livestream'; +import '../app/logger'; +import '../app/token-login'; +import '../app/mapview'; +import '../app/markdown'; +import '../app/mentions'; +import '../app/mentions-flextab'; +import '../app/message-action'; +import '../app/message-attachments'; +import '../app/message-mark-as-unread'; +import '../app/message-pin'; +import '../app/message-snippet'; +import '../app/message-star'; +import '../app/oauth2-server-config'; +import '../app/oembed'; +import '../app/otr'; +import '../app/push-notifications'; +import '../app/apps'; +import '../app/sandstorm'; +import '../app/setup-wizard'; +import '../app/slackbridge'; +import '../app/slashcommands-archiveroom'; +import '../app/slashcommand-asciiarts'; +import '../app/slashcommands-create'; +import '../app/slashcommands-hide'; +import '../app/slashcommands-invite'; +import '../app/slashcommands-inviteall'; +import '../app/slashcommands-join'; +import '../app/slashcommands-kick'; +import '../app/slashcommands-open'; +import '../app/slashcommands-topic'; +import '../app/slashcommands-unarchiveroom'; +import '../app/slider'; +import '../app/spotify'; +import '../app/statistics'; +import '../app/theme'; +import '../app/tokenpass'; +import '../app/tooltip'; +import '../app/ui'; +import '../app/ui-account'; +import '../app/ui-admin'; +import '../app/ui-clean-history'; +import '../app/ui-flextab'; +import '../app/ui-login'; +import '../app/ui-master'; +import '../app/ui-message'; +import '../app/ui-sidenav'; +import '../app/ui-vrecord'; +import '../app/videobridge'; +import '../app/webdav'; +import '../app/webrtc'; +import '../app/wordpress'; +import '../app/nrr'; +import '../app/meteor-accounts-saml'; +import '../app/e2e'; +import '../app/blockstack'; +import '../app/version-check'; +import '../app/search'; +import '../app/chatpal-search'; +import '../app/lazy-load'; +import '../app/threading'; +import '../app/mail-messages'; +import '../app/utils'; +import '../app/settings'; +import '../app/models'; +import '../app/callbacks'; +import '../app/notifications'; +import '../app/promises'; +import '../app/ui-utils'; +import '../app/ui-cached-collection'; +import '../app/action-links'; +import '../app/reactions'; +import '../app/livechat'; diff --git a/client/importsCss.js b/client/importsCss.js index 8955d8ebb03..68ed4e047a1 100644 --- a/client/importsCss.js +++ b/client/importsCss.js @@ -1,43 +1,43 @@ -import '/app/chatpal-search/client/style.css'; -import '/app/theme/client/main.css'; -import '/app/theme/client/vendor/photoswipe.css'; -import '/app/theme/client/vendor/fontello/css/fontello.css'; -import '/app/action-links/client/stylesheets/actionLinks.css'; -import '/app/authorization/client/stylesheets/permissions.css'; -import '/app/autotranslate/client/stylesheets/autotranslate.css'; -import '/app/channel-settings/client/stylesheets/channel-settings.css'; -import '/app/colors/client/style.css'; -import '/app/custom-sounds/assets/stylesheets/customSoundsAdmin.css'; -import '/app/dolphin/client/login-button.css'; -import '/app/drupal/client/login-button.css'; -import '/app/e2e/client/stylesheets/e2e.less'; -import '/app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css'; -import '/app/emoji-emojione/client/sprites.css'; -import '/app/github-enterprise/client/github-enterprise-login-button.css'; -import '/app/gitlab/client/gitlab-login-button.css'; -import '/app/integrations/client/stylesheets/integrations.css'; -import '/app/katex/client/style.css'; -import '/app/livechat/client/stylesheets/livechat.less'; -import '/app/livestream/client/styles/liveStreamTab.css'; -import '/app/mentions-flextab/client/views/stylesheets/mentionsFlexTab.less'; -import '/app/message-action/client/stylesheets/messageAction.css'; -import '/app/message-attachments/client/stylesheets/messageAttachments.css'; -import '/app/message-pin/client/views/stylesheets/messagepin.css'; -import '/app/message-snippet/client/page/stylesheets/snippetPage.css'; -import '/app/message-star/client/views/stylesheets/messagestar.css'; -import '/app/oauth2-server-config/client/oauth/stylesheets/oauth2.css'; -import '/app/otr/client/stylesheets/otr.css'; -import '/app/push-notifications/client/stylesheets/pushNotifications.css'; -import '/app/reactions/client/stylesheets/reaction.css'; -import '/app/search/client/style/style.css'; -import '/app/tokenpass/client/login-button.css'; -import '/app/tokenpass/client/channelSettings.css'; -import '/app/tokenpass/client/styles.css'; -import '/app/tooltip/client/tooltip.css'; -import '/app/ui-clean-history/client/views/stylesheets/cleanHistory.css'; -import '/app/ui-vrecord/client/vrecord.css'; -import '/app/videobridge/client/stylesheets/video.less'; -import '/app/wordpress/client/wordpress-login-button.css'; -import '/app/katex/katex.min.css'; -import '/app/threading/client/public/stylesheets/threading.css'; +import '../app/chatpal-search/client/style.css'; +import '../app/theme/client/main.css'; +import '../app/theme/client/vendor/photoswipe.css'; +import '../app/theme/client/vendor/fontello/css/fontello.css'; +import '../app/action-links/client/stylesheets/actionLinks.css'; +import '../app/authorization/client/stylesheets/permissions.css'; +import '../app/autotranslate/client/stylesheets/autotranslate.css'; +import '../app/channel-settings/client/stylesheets/channel-settings.css'; +import '../app/colors/client/style.css'; +import '../app/custom-sounds/assets/stylesheets/customSoundsAdmin.css'; +import '../app/dolphin/client/login-button.css'; +import '../app/drupal/client/login-button.css'; +import '../app/e2e/client/stylesheets/e2e.less'; +import '../app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css'; +import '../app/emoji-emojione/client/sprites.css'; +import '../app/github-enterprise/client/github-enterprise-login-button.css'; +import '../app/gitlab/client/gitlab-login-button.css'; +import '../app/integrations/client/stylesheets/integrations.css'; +import '../app/katex/client/style.css'; +import '../app/livechat/client/stylesheets/livechat.less'; +import '../app/livestream/client/styles/liveStreamTab.css'; +import '../app/mentions-flextab/client/views/stylesheets/mentionsFlexTab.less'; +import '../app/message-action/client/stylesheets/messageAction.css'; +import '../app/message-attachments/client/stylesheets/messageAttachments.css'; +import '../app/message-pin/client/views/stylesheets/messagepin.css'; +import '../app/message-snippet/client/page/stylesheets/snippetPage.css'; +import '../app/message-star/client/views/stylesheets/messagestar.css'; +import '../app/oauth2-server-config/client/oauth/stylesheets/oauth2.css'; +import '../app/otr/client/stylesheets/otr.css'; +import '../app/push-notifications/client/stylesheets/pushNotifications.css'; +import '../app/reactions/client/stylesheets/reaction.css'; +import '../app/search/client/style/style.css'; +import '../app/tokenpass/client/login-button.css'; +import '../app/tokenpass/client/channelSettings.css'; +import '../app/tokenpass/client/styles.css'; +import '../app/tooltip/client/tooltip.css'; +import '../app/ui-clean-history/client/views/stylesheets/cleanHistory.css'; +import '../app/ui-vrecord/client/vrecord.css'; +import '../app/videobridge/client/stylesheets/video.less'; +import '../app/wordpress/client/wordpress-login-button.css'; +import '../app/katex/katex.min.css'; +import '../app/threading/client/public/stylesheets/threading.css'; diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js index d4ce87be997..79314f8661b 100644 --- a/client/methods/deleteMessage.js +++ b/client/methods/deleteMessage.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { ChatMessage } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { settings } from '/app/settings'; +import { ChatMessage } from '../../app/models'; +import { hasAtLeastOnePermission } from '../../app/authorization'; +import { settings } from '../../app/settings'; import _ from 'underscore'; import moment from 'moment'; diff --git a/client/methods/hideRoom.js b/client/methods/hideRoom.js index 424579e6fe7..9b93fe9e4cf 100644 --- a/client/methods/hideRoom.js +++ b/client/methods/hideRoom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { ChatSubscription } from '/app/models'; +import { ChatSubscription } from '../../app/models'; Meteor.methods({ hideRoom(rid) { diff --git a/client/methods/openRoom.js b/client/methods/openRoom.js index 56458f8b7df..cc242a2c05e 100644 --- a/client/methods/openRoom.js +++ b/client/methods/openRoom.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { ChatSubscription } from '/app/models'; +import { ChatSubscription } from '../../app/models'; Meteor.methods({ openRoom(rid) { diff --git a/client/methods/toggleFavorite.js b/client/methods/toggleFavorite.js index 9b1c4a7f705..e6a4ebbeec3 100644 --- a/client/methods/toggleFavorite.js +++ b/client/methods/toggleFavorite.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { ChatSubscription } from '/app/models'; +import { ChatSubscription } from '../../app/models'; Meteor.methods({ toggleFavorite(rid, f) { diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js index 5a566cb15e5..4e4811d81d4 100644 --- a/client/methods/updateMessage.js +++ b/client/methods/updateMessage.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { TimeSync } from 'meteor/mizzao:timesync'; -import { t } from '/app/utils'; -import { ChatMessage } from '/app/models'; -import { hasAtLeastOnePermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { t } from '../../app/utils'; +import { ChatMessage } from '../../app/models'; +import { hasAtLeastOnePermission } from '../../app/authorization'; +import { settings } from '../../app/settings'; +import { callbacks } from '../../app/callbacks'; import _ from 'underscore'; import moment from 'moment'; import toastr from 'toastr'; diff --git a/client/notifications/UsersNameChanged.js b/client/notifications/UsersNameChanged.js index 01e1a6b1a59..8af9032ce10 100644 --- a/client/notifications/UsersNameChanged.js +++ b/client/notifications/UsersNameChanged.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Notifications } from '/app/notifications'; -import { Messages, Subscriptions } from '/app/models'; +import { Notifications } from '../../app/notifications'; +import { Messages, Subscriptions } from '../../app/models'; Meteor.startup(function() { Notifications.onLogged('Users:NameChanged', function({ _id, name, username }) { diff --git a/client/notifications/notification.js b/client/notifications/notification.js index 724c31ce2aa..0b079d29e66 100644 --- a/client/notifications/notification.js +++ b/client/notifications/notification.js @@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -import { KonchatNotification } from '/app/ui'; -import { CachedChatSubscription } from '/app/models'; -import { fireGlobalEvent, readMessage, Layout } from '/app/ui-utils'; -import { getUserPreference } from '/app/utils'; -import { Notifications } from '/app/notifications'; +import { KonchatNotification } from '../../app/ui'; +import { CachedChatSubscription } from '../../app/models'; +import { fireGlobalEvent, readMessage, Layout } from '../../app/ui-utils'; +import { getUserPreference } from '../../app/utils'; +import { Notifications } from '../../app/notifications'; // Show notifications and play a sound for new messages. // We trust the server to only send notifications for interesting messages, e.g. direct messages or diff --git a/client/notifications/updateAvatar.js b/client/notifications/updateAvatar.js index 719191c5734..2dd3bf6a63f 100644 --- a/client/notifications/updateAvatar.js +++ b/client/notifications/updateAvatar.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { updateAvatarOfUsername } from '/app/ui-utils'; -import { Notifications } from '/app/notifications'; +import { updateAvatarOfUsername } from '../../app/ui-utils'; +import { Notifications } from '../../app/notifications'; Meteor.startup(function() { Notifications.onLogged('updateAvatar', function(data) { diff --git a/client/notifications/updateUserState.js b/client/notifications/updateUserState.js index 551f432a6a6..b2e8c047754 100644 --- a/client/notifications/updateUserState.js +++ b/client/notifications/updateUserState.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { fireGlobalEvent } from '/app/ui-utils'; -import { callbacks } from '/app/callbacks'; +import { fireGlobalEvent } from '../../app/ui-utils'; +import { callbacks } from '../../app/callbacks'; /* fire user state change globally, to listen on desktop electron client */ Meteor.startup(function() { diff --git a/client/routes/roomRoute.js b/client/routes/roomRoute.js index c1996f610cb..e2c97725222 100644 --- a/client/routes/roomRoute.js +++ b/client/routes/roomRoute.js @@ -1,9 +1,9 @@ import mem from 'mem'; import { FlowRouter } from 'meteor/kadira:flow-router'; -import { ChatSubscription } from '/app/models'; -import { roomTypes } from '/app/utils'; -import { call } from '/app/ui-utils'; +import { ChatSubscription } from '../../app/models'; +import { roomTypes } from '../../app/utils'; +import { call } from '../../app/ui-utils'; const getRoomById = mem((rid) => call('getRoomById', rid)); diff --git a/client/routes/router.js b/client/routes/router.js index 5f56a635875..9c17096e8e0 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -5,7 +5,7 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { Session } from 'meteor/session'; -import { KonchatNotification } from '/app/ui'; +import { KonchatNotification } from '../../app/ui'; import s from 'underscore.string'; Blaze.registerHelper('pathFor', function(path, kw) { diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js index 552775e0522..acc0f762ad9 100644 --- a/client/startup/emailVerification.js +++ b/client/startup/emailVerification.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; -import { settings } from '/app/settings'; +import { settings } from '../../app/settings'; import toastr from 'toastr'; Meteor.startup(function() { diff --git a/client/startup/i18n.js b/client/startup/i18n.js index 52f6663a4c0..4dfd9f458e8 100644 --- a/client/startup/i18n.js +++ b/client/startup/i18n.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { TAPi18n } from 'meteor/tap:i18n'; -import { isRtl } from '/app/utils'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; +import { isRtl } from '../../app/utils'; +import { settings } from '../../app/settings'; +import { Users } from '../../app/models'; import moment from 'moment'; const currentLanguage = new ReactiveVar(); diff --git a/client/startup/roomObserve.js b/client/startup/roomObserve.js index 0d1ba12b6be..8214a993f6d 100644 --- a/client/startup/roomObserve.js +++ b/client/startup/roomObserve.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { ChatRoom } from '/app/models'; +import { ChatRoom } from '../../app/models'; Meteor.startup(function() { ChatRoom.find().observe({ diff --git a/client/startup/startup.js b/client/startup/startup.js index b26cc4f9b0a..eed7ec00551 100644 --- a/client/startup/startup.js +++ b/client/startup/startup.js @@ -3,10 +3,10 @@ import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { TimeSync } from 'meteor/mizzao:timesync'; import { UserPresence } from 'meteor/konecty:user-presence'; -import { fireGlobalEvent } from '/app/ui-utils'; -import { settings } from '/app/settings'; -import { Users } from '/app/models'; -import { getUserPreference } from '/app/utils'; +import { fireGlobalEvent } from '../../app/ui-utils'; +import { settings } from '../../app/settings'; +import { Users } from '../../app/models'; +import { getUserPreference } from '../../app/utils'; import toastr from 'toastr'; import hljs from 'highlight.js'; import 'highlight.js/styles/github.css'; diff --git a/client/startup/unread.js b/client/startup/unread.js index 368af894515..abc28c9068c 100644 --- a/client/startup/unread.js +++ b/client/startup/unread.js @@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -import { Favico } from '/app/favico'; -import { ChatSubscription } from '/app/models'; -import { RoomManager, menu, fireGlobalEvent, readMessage } from '/app/ui-utils'; -import { getUserPreference } from '/app/utils'; -import { settings } from '/app/settings'; +import { Favico } from '../../app/favico'; +import { ChatSubscription } from '../../app/models'; +import { RoomManager, menu, fireGlobalEvent, readMessage } from '../../app/ui-utils'; +import { getUserPreference } from '../../app/utils'; +import { settings } from '../../app/settings'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js index 96abd5ee923..7ce89fec7b6 100644 --- a/client/startup/userSetUtcOffset.js +++ b/client/startup/userSetUtcOffset.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; import moment from 'moment'; Meteor.startup(function() { diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js index a81ae513c9b..4bc6292d648 100644 --- a/client/startup/usersObserve.js +++ b/client/startup/usersObserve.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -import { RoomManager } from '/app/ui-utils'; +import { RoomManager } from '../../app/ui-utils'; Meteor.startup(function() { Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({ diff --git a/imports/message-read-receipt/client/main.js b/imports/message-read-receipt/client/main.js index b940a173852..e1f6274d508 100644 --- a/imports/message-read-receipt/client/main.js +++ b/imports/message-read-receipt/client/main.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../app/settings'; Template.main.helpers({ readReceiptsEnabled() { diff --git a/imports/message-read-receipt/client/message.js b/imports/message-read-receipt/client/message.js index 10927d40f27..bfbe30624aa 100644 --- a/imports/message-read-receipt/client/message.js +++ b/imports/message-read-receipt/client/message.js @@ -1,5 +1,5 @@ import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../app/settings'; Template.message.helpers({ readReceipt() { diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js index 37c64ab7853..bc59874f85a 100644 --- a/imports/message-read-receipt/client/readReceipts.js +++ b/imports/message-read-receipt/client/readReceipts.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; -import { settings } from '/app/settings'; +import { settings } from '../../../app/settings'; import moment from 'moment'; import './readReceipts.css'; diff --git a/imports/message-read-receipt/client/room.js b/imports/message-read-receipt/client/room.js index 9bc4d49253b..97641cc1202 100644 --- a/imports/message-read-receipt/client/room.js +++ b/imports/message-read-receipt/client/room.js @@ -1,6 +1,6 @@ -import { t } from '/app/utils'; -import { modal, MessageAction } from '/app/ui-utils'; -import { settings } from '/app/settings'; +import { t } from '../../../app/utils'; +import { modal, MessageAction } from '../../../app/ui-utils'; +import { settings } from '../../../app/settings'; MessageAction.addButton({ id: 'receipt-detail', diff --git a/imports/message-read-receipt/server/api/methods/getReadReceipts.js b/imports/message-read-receipt/server/api/methods/getReadReceipts.js index c8278ccda74..fdc0d0d4204 100644 --- a/imports/message-read-receipt/server/api/methods/getReadReceipts.js +++ b/imports/message-read-receipt/server/api/methods/getReadReceipts.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Messages } from '/app/models'; +import { Messages } from '../../../../../app/models'; import { ReadReceipt } from '../../lib/ReadReceipt'; Meteor.methods({ diff --git a/imports/message-read-receipt/server/hooks.js b/imports/message-read-receipt/server/hooks.js index 934f2c8b4f2..24c0e6e9479 100644 --- a/imports/message-read-receipt/server/hooks.js +++ b/imports/message-read-receipt/server/hooks.js @@ -1,5 +1,5 @@ -import { callbacks } from '/app/callbacks'; -import { Subscriptions } from '/app/models'; +import { callbacks } from '../../../app/callbacks'; +import { Subscriptions } from '../../../app/models'; import { ReadReceipt } from './lib/ReadReceipt'; callbacks.add('afterSaveMessage', (message, room) => { diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js index 7a8b10867f3..aa278884e0c 100644 --- a/imports/message-read-receipt/server/lib/ReadReceipt.js +++ b/imports/message-read-receipt/server/lib/ReadReceipt.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; -import { ReadReceipts, Subscriptions, Messages, Rooms, Users } from '/app/models'; -import { settings } from '/app/settings'; +import { ReadReceipts, Subscriptions, Messages, Rooms, Users } from '../../../../app/models'; +import { settings } from '../../../../app/settings'; const rawReadReceipts = ReadReceipts.model.rawCollection(); diff --git a/imports/message-read-receipt/server/settings.js b/imports/message-read-receipt/server/settings.js index f53e0830aaa..be8b123b2da 100644 --- a/imports/message-read-receipt/server/settings.js +++ b/imports/message-read-receipt/server/settings.js @@ -1,4 +1,4 @@ -import { settings } from '/app/settings'; +import { settings } from '../../../app/settings'; settings.add('Message_Read_Receipt_Enabled', false, { group: 'Message', diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js index 9a5c0e22f4c..6fea0b65e1f 100644 --- a/imports/personal-access-tokens/client/personalAccessTokens.js +++ b/imports/personal-access-tokens/client/personalAccessTokens.js @@ -3,9 +3,9 @@ import { Mongo } from 'meteor/mongo'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; -import { t } from '/app/utils'; -import { modal, SideNav } from '/app/ui-utils'; -import { hasAllPermission } from '/app/authorization'; +import { t } from '../../../app/utils'; +import { modal, SideNav } from '../../../app/ui-utils'; +import { hasAllPermission } from '../../../app/authorization'; import toastr from 'toastr'; import moment from 'moment'; diff --git a/imports/personal-access-tokens/server/api/methods/generateToken.js b/imports/personal-access-tokens/server/api/methods/generateToken.js index 646759adc3b..17a714a5062 100644 --- a/imports/personal-access-tokens/server/api/methods/generateToken.js +++ b/imports/personal-access-tokens/server/api/methods/generateToken.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { Accounts } from 'meteor/accounts-base'; -import { hasPermission } from '/app/authorization'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../../../app/authorization'; +import { Users } from '../../../../../app/models'; Meteor.methods({ 'personalAccessTokens:generateToken'({ tokenName }) { diff --git a/imports/personal-access-tokens/server/api/methods/regenerateToken.js b/imports/personal-access-tokens/server/api/methods/regenerateToken.js index 92e10c2bb9d..5fc71b0fe23 100644 --- a/imports/personal-access-tokens/server/api/methods/regenerateToken.js +++ b/imports/personal-access-tokens/server/api/methods/regenerateToken.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../../../app/authorization'; +import { Users } from '../../../../../app/models'; Meteor.methods({ 'personalAccessTokens:regenerateToken'({ tokenName }) { diff --git a/imports/personal-access-tokens/server/api/methods/removeToken.js b/imports/personal-access-tokens/server/api/methods/removeToken.js index c171e430612..d0b60b6afa2 100644 --- a/imports/personal-access-tokens/server/api/methods/removeToken.js +++ b/imports/personal-access-tokens/server/api/methods/removeToken.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../../../app/authorization'; +import { Users } from '../../../../../app/models'; Meteor.methods({ 'personalAccessTokens:removeToken'({ tokenName }) { diff --git a/imports/personal-access-tokens/server/publications/personalAccessTokens.js b/imports/personal-access-tokens/server/publications/personalAccessTokens.js index ffcb7bc50ff..71be1107a94 100644 --- a/imports/personal-access-tokens/server/publications/personalAccessTokens.js +++ b/imports/personal-access-tokens/server/publications/personalAccessTokens.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Users } from '/app/models'; +import { hasPermission } from '../../../../app/authorization'; +import { Users } from '../../../../app/models'; Meteor.publish('personalAccessTokens', function() { if (!this.userId) { diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js index e9368034a69..ebd316b1f4b 100644 --- a/server/configuration/accounts_meld.js +++ b/server/configuration/accounts_meld.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import { Accounts } from 'meteor/accounts-base'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; const orig_updateOrCreateUserFromExternalService = Accounts.updateOrCreateUserFromExternalService; diff --git a/server/importPackages.js b/server/importPackages.js index e47c80de86c..cba8f2be173 100644 --- a/server/importPackages.js +++ b/server/importPackages.js @@ -1,119 +1,119 @@ -import '/app/cors'; -import '/app/sms'; -import '/app/2fa'; -import '/app/accounts'; -import '/app/analytics'; -import '/app/api'; -import '/app/assets'; -import '/app/authorization'; -import '/app/autolinker'; -import '/app/autotranslate'; -import '/app/bot-helpers'; -import '/app/cas'; -import '/app/channel-settings'; -import '/app/channel-settings-mail-messages'; -import '/app/cloud'; -import '/app/colors'; -import '/app/crowd'; -import '/app/custom-oauth'; -import '/app/custom-sounds'; -import '/app/dolphin'; -import '/app/drupal'; -import '/app/emoji'; -import '/app/emoji-custom'; -import '/app/emoji-emojione'; -import '/app/error-handler'; -import '/app/federation'; -import '/app/file'; -import '/app/file-upload'; -import '/app/github-enterprise'; -import '/app/gitlab'; -import '/app/google-vision'; -import '/app/grant'; -import '/app/grant-facebook'; -import '/app/grant-github'; -import '/app/grant-google'; -import '/app/graphql'; -import '/app/iframe-login'; -import '/app/importer'; -import '/app/importer-csv'; -import '/app/importer-hipchat'; -import '/app/importer-hipchat-enterprise'; -import '/app/importer-slack'; -import '/app/importer-slack-users'; -import '/app/integrations'; -import '/app/irc'; -import '/app/issuelinks'; -import '/app/katex'; -import '/app/ldap'; -import '/app/lib'; -import '/app/livestream'; -import '/app/logger'; -import '/app/token-login'; -import '/app/mailer'; -import '/app/mapview'; -import '/app/markdown'; -import '/app/mentions'; -import '/app/mentions-flextab'; -import '/app/message-mark-as-unread'; -import '/app/message-pin'; -import '/app/message-snippet'; -import '/app/message-star'; -import '/app/migrations'; -import '/app/oauth2-server-config'; -import '/app/oembed'; -import '/app/otr'; -import '/app/push-notifications'; -import '/app/retention-policy'; -import '/app/apps'; -import '/app/sandstorm'; -import '/app/setup-wizard'; -import '/app/slackbridge'; -import '/app/slashcommands-archiveroom'; -import '/app/slashcommand-asciiarts'; -import '/app/slashcommands-create'; -import '/app/slashcommands-help'; -import '/app/slashcommands-hide'; -import '/app/slashcommands-invite'; -import '/app/slashcommands-inviteall'; -import '/app/slashcommands-join'; -import '/app/slashcommands-kick'; -import '/app/slashcommands-leave'; -import '/app/slashcommands-me'; -import '/app/slashcommands-msg'; -import '/app/slashcommands-mute'; -import '/app/slashcommands-topic'; -import '/app/slashcommands-unarchiveroom'; -import '/app/smarsh-connector'; -import '/app/spotify'; -import '/app/statistics'; -import '/app/theme'; -import '/app/tokenpass'; -import '/app/ui-admin'; -import '/app/ui-master'; -import '/app/ui-vrecord'; -import '/app/user-data-download'; -import '/app/videobridge'; -import '/app/webdav'; -import '/app/webrtc'; -import '/app/wordpress'; -import '/app/meteor-accounts-saml'; -import '/app/e2e'; -import '/app/blockstack'; -import '/app/version-check'; -import '/app/search'; -import '/app/chatpal-search'; -import '/app/threading'; -import '/app/bigbluebutton'; -import '/app/mail-messages'; -import '/app/utils'; -import '/app/settings'; -import '/app/models'; -import '/app/metrics'; -import '/app/callbacks'; -import '/app/notifications'; -import '/app/promises'; -import '/app/ui-utils'; -import '/app/action-links'; -import '/app/reactions'; -import '/app/livechat'; +import '../app/cors'; +import '../app/sms'; +import '../app/2fa'; +import '../app/accounts'; +import '../app/analytics'; +import '../app/api'; +import '../app/assets'; +import '../app/authorization'; +import '../app/autolinker'; +import '../app/autotranslate'; +import '../app/bot-helpers'; +import '../app/cas'; +import '../app/channel-settings'; +import '../app/channel-settings-mail-messages'; +import '../app/cloud'; +import '../app/colors'; +import '../app/crowd'; +import '../app/custom-oauth'; +import '../app/custom-sounds'; +import '../app/dolphin'; +import '../app/drupal'; +import '../app/emoji'; +import '../app/emoji-custom'; +import '../app/emoji-emojione'; +import '../app/error-handler'; +import '../app/federation'; +import '../app/file'; +import '../app/file-upload'; +import '../app/github-enterprise'; +import '../app/gitlab'; +import '../app/google-vision'; +import '../app/grant'; +import '../app/grant-facebook'; +import '../app/grant-github'; +import '../app/grant-google'; +import '../app/graphql'; +import '../app/iframe-login'; +import '../app/importer'; +import '../app/importer-csv'; +import '../app/importer-hipchat'; +import '../app/importer-hipchat-enterprise'; +import '../app/importer-slack'; +import '../app/importer-slack-users'; +import '../app/integrations'; +import '../app/irc'; +import '../app/issuelinks'; +import '../app/katex'; +import '../app/ldap'; +import '../app/lib'; +import '../app/livestream'; +import '../app/logger'; +import '../app/token-login'; +import '../app/mailer'; +import '../app/mapview'; +import '../app/markdown'; +import '../app/mentions'; +import '../app/mentions-flextab'; +import '../app/message-mark-as-unread'; +import '../app/message-pin'; +import '../app/message-snippet'; +import '../app/message-star'; +import '../app/migrations'; +import '../app/oauth2-server-config'; +import '../app/oembed'; +import '../app/otr'; +import '../app/push-notifications'; +import '../app/retention-policy'; +import '../app/apps'; +import '../app/sandstorm'; +import '../app/setup-wizard'; +import '../app/slackbridge'; +import '../app/slashcommands-archiveroom'; +import '../app/slashcommand-asciiarts'; +import '../app/slashcommands-create'; +import '../app/slashcommands-help'; +import '../app/slashcommands-hide'; +import '../app/slashcommands-invite'; +import '../app/slashcommands-inviteall'; +import '../app/slashcommands-join'; +import '../app/slashcommands-kick'; +import '../app/slashcommands-leave'; +import '../app/slashcommands-me'; +import '../app/slashcommands-msg'; +import '../app/slashcommands-mute'; +import '../app/slashcommands-topic'; +import '../app/slashcommands-unarchiveroom'; +import '../app/smarsh-connector'; +import '../app/spotify'; +import '../app/statistics'; +import '../app/theme'; +import '../app/tokenpass'; +import '../app/ui-admin'; +import '../app/ui-master'; +import '../app/ui-vrecord'; +import '../app/user-data-download'; +import '../app/videobridge'; +import '../app/webdav'; +import '../app/webrtc'; +import '../app/wordpress'; +import '../app/meteor-accounts-saml'; +import '../app/e2e'; +import '../app/blockstack'; +import '../app/version-check'; +import '../app/search'; +import '../app/chatpal-search'; +import '../app/threading'; +import '../app/bigbluebutton'; +import '../app/mail-messages'; +import '../app/utils'; +import '../app/settings'; +import '../app/models'; +import '../app/metrics'; +import '../app/callbacks'; +import '../app/notifications'; +import '../app/promises'; +import '../app/ui-utils'; +import '../app/action-links'; +import '../app/reactions'; +import '../app/livechat'; diff --git a/server/lib/accounts.js b/server/lib/accounts.js index f22c3ed4c1f..a5f0f4ac029 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -4,11 +4,11 @@ import { Accounts } from 'meteor/accounts-base'; import { TAPi18n } from 'meteor/tap:i18n'; import _ from 'underscore'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; -import { Roles, Users, Settings } from '/app/models'; -import { addUserRoles } from '/app/authorization'; +import * as Mailer from '../../app/mailer'; +import { settings } from '../../app/settings'; +import { callbacks } from '../../app/callbacks'; +import { Roles, Users, Settings } from '../../app/models'; +import { addUserRoles } from '../../app/authorization'; const accountsConfig = { forbidClientAccountCreation: true, diff --git a/server/lib/cordova.js b/server/lib/cordova.js index 1864a6ec9f6..982e7afed5f 100644 --- a/server/lib/cordova.js +++ b/server/lib/cordova.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import { TAPi18n } from 'meteor/tap:i18n'; -import { SystemLogger } from '/app/logger'; -import { getWorkspaceAccessToken } from '/app/cloud'; +import { SystemLogger } from '../../app/logger'; +import { getWorkspaceAccessToken } from '../../app/cloud'; import { Push } from 'meteor/rocketchat:push'; -import { hasRole } from '/app/authorization'; -import { settings } from '/app/settings'; +import { hasRole } from '../../app/authorization'; +import { settings } from '../../app/settings'; Meteor.methods({ diff --git a/server/lib/roomFiles.js b/server/lib/roomFiles.js index 18ee557553f..19152166329 100644 --- a/server/lib/roomFiles.js +++ b/server/lib/roomFiles.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Uploads } from '/app/models'; +import { Users, Uploads } from '../../app/models'; export const roomFiles = (pub, { rid, searchText, limit = 50 }) => { if (!pub.userId) { diff --git a/server/methods/OEmbedCacheCleanup.js b/server/methods/OEmbedCacheCleanup.js index 657e7180e71..dce33adcd46 100644 --- a/server/methods/OEmbedCacheCleanup.js +++ b/server/methods/OEmbedCacheCleanup.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { OEmbedCache } from '/app/models'; -import { settings } from '/app/settings'; -import { hasRole } from '/app/authorization'; +import { OEmbedCache } from '../../app/models'; +import { settings } from '../../app/settings'; +import { hasRole } from '../../app/authorization'; Meteor.methods({ OEmbedCacheCleanup() { diff --git a/server/methods/addAllUserToRoom.js b/server/methods/addAllUserToRoom.js index 1c7e9576fb7..8270f05d77b 100644 --- a/server/methods/addAllUserToRoom.js +++ b/server/methods/addAllUserToRoom.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasRole } from '/app/authorization'; -import { Users, Rooms, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { callbacks } from '/app/callbacks'; +import { hasRole } from '../../app/authorization'; +import { Users, Rooms, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ addAllUserToRoom(rid, activeUsersOnly = false) { diff --git a/server/methods/addRoomLeader.js b/server/methods/addRoomLeader.js index 73149be6311..fce2764c4a7 100644 --- a/server/methods/addRoomLeader.js +++ b/server/methods/addRoomLeader.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ addRoomLeader(rid, userId) { diff --git a/server/methods/addRoomModerator.js b/server/methods/addRoomModerator.js index ff5c35fd8ba..69bf8cc9f24 100644 --- a/server/methods/addRoomModerator.js +++ b/server/methods/addRoomModerator.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ addRoomModerator(rid, userId) { diff --git a/server/methods/addRoomOwner.js b/server/methods/addRoomOwner.js index 630f974774d..5935dfd133a 100644 --- a/server/methods/addRoomOwner.js +++ b/server/methods/addRoomOwner.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ addRoomOwner(rid, userId) { diff --git a/server/methods/afterVerifyEmail.js b/server/methods/afterVerifyEmail.js index 900198417f1..88aaa93df4c 100644 --- a/server/methods/afterVerifyEmail.js +++ b/server/methods/afterVerifyEmail.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users, Roles } from '/app/models'; +import { Users, Roles } from '../../app/models'; import _ from 'underscore'; Meteor.methods({ diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js index dc61328ea57..ffb28d5ecca 100644 --- a/server/methods/browseChannels.js +++ b/server/methods/browseChannels.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Users } from '/app/models'; +import { hasPermission } from '../../app/authorization'; +import { Rooms, Users } from '../../app/models'; import s from 'underscore.string'; -import { Federation } from '/app/federation'; +import { Federation } from '../../app/federation'; const sortChannels = function(field, direction) { switch (field) { diff --git a/server/methods/canAccessRoom.js b/server/methods/canAccessRoom.js index 0b698c7333a..928e7c7ac28 100644 --- a/server/methods/canAccessRoom.js +++ b/server/methods/canAccessRoom.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Users, Rooms } from '/app/models'; -import { canAccessRoom } from '/app/authorization'; -import { settings } from '/app/settings'; +import { Users, Rooms } from '../../app/models'; +import { canAccessRoom } from '../../app/authorization'; +import { settings } from '../../app/settings'; Meteor.methods({ canAccessRoom(rid, userId, extraData) { diff --git a/server/methods/channelsList.js b/server/methods/channelsList.js index 7ee24e28621..cbb85ef93f1 100644 --- a/server/methods/channelsList.js +++ b/server/methods/channelsList.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Subscriptions, Users } from '/app/models'; -import { getUserPreference } from '/app/utils'; -import { settings } from '/app/settings'; +import { hasPermission } from '../../app/authorization'; +import { Rooms, Subscriptions, Users } from '../../app/models'; +import { getUserPreference } from '../../app/utils'; +import { settings } from '../../app/settings'; import _ from 'underscore'; import s from 'underscore.string'; diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js index 73e5829c1e4..396e15590f9 100644 --- a/server/methods/createDirectMessage.js +++ b/server/methods/createDirectMessage.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { settings } from '/app/settings'; -import { hasPermission } from '/app/authorization'; -import { Users, Rooms, Subscriptions } from '/app/models'; -import { getDefaultSubscriptionPref } from '/app/utils'; -import { RateLimiter } from '/app/lib'; -import { callbacks } from '/app/callbacks'; +import { settings } from '../../app/settings'; +import { hasPermission } from '../../app/authorization'; +import { Users, Rooms, Subscriptions } from '../../app/models'; +import { getDefaultSubscriptionPref } from '../../app/utils'; +import { RateLimiter } from '../../app/lib'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ createDirectMessage(username) { diff --git a/server/methods/deleteFileMessage.js b/server/methods/deleteFileMessage.js index 8c4c8d5ffff..ba946c2e4e9 100644 --- a/server/methods/deleteFileMessage.js +++ b/server/methods/deleteFileMessage.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { FileUpload } from '/app/file-upload'; -import { Messages } from '/app/models'; +import { FileUpload } from '../../app/file-upload'; +import { Messages } from '../../app/models'; Meteor.methods({ deleteFileMessage(fileID) { diff --git a/server/methods/deleteUser.js b/server/methods/deleteUser.js index 0990c65b701..bab9b7ea840 100644 --- a/server/methods/deleteUser.js +++ b/server/methods/deleteUser.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Users } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { deleteUser } from '/app/lib'; +import { Users } from '../../app/models'; +import { hasPermission } from '../../app/authorization'; +import { deleteUser } from '../../app/lib'; Meteor.methods({ deleteUser(userId) { diff --git a/server/methods/eraseRoom.js b/server/methods/eraseRoom.js index 1826c64e2f8..672d7d37c85 100644 --- a/server/methods/eraseRoom.js +++ b/server/methods/eraseRoom.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { deleteRoom } from '/app/lib'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; -import { Apps } from '/app/apps'; -import { roomTypes } from '/app/utils'; +import { deleteRoom } from '../../app/lib'; +import { hasPermission } from '../../app/authorization'; +import { Rooms } from '../../app/models'; +import { Apps } from '../../app/apps'; +import { roomTypes } from '../../app/utils'; Meteor.methods({ eraseRoom(rid) { diff --git a/server/methods/getAvatarSuggestion.js b/server/methods/getAvatarSuggestion.js index fe90a9a76b0..d4ac947e91c 100644 --- a/server/methods/getAvatarSuggestion.js +++ b/server/methods/getAvatarSuggestion.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { getAvatarSuggestionForUser } from '/app/lib'; +import { getAvatarSuggestionForUser } from '../../app/lib'; Meteor.methods({ getAvatarSuggestion() { diff --git a/server/methods/getRoomById.js b/server/methods/getRoomById.js index 03bff1711aa..4550d824e2f 100644 --- a/server/methods/getRoomById.js +++ b/server/methods/getRoomById.js @@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { Rooms } from '/app/models'; -import { canAccessRoom } from '/app/authorization'; +import { Rooms } from '../../app/models'; +import { canAccessRoom } from '../../app/authorization'; Meteor.methods({ getRoomById(rid) { diff --git a/server/methods/getRoomIdByNameOrId.js b/server/methods/getRoomIdByNameOrId.js index dc333e6f225..43e3d977316 100644 --- a/server/methods/getRoomIdByNameOrId.js +++ b/server/methods/getRoomIdByNameOrId.js @@ -1,8 +1,8 @@ // DEPRECATE import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms } from '/app/models'; -import { canAccessRoom } from '/app/authorization'; +import { Rooms } from '../../app/models'; +import { canAccessRoom } from '../../app/authorization'; Meteor.methods({ getRoomIdByNameOrId(rid) { diff --git a/server/methods/getRoomNameById.js b/server/methods/getRoomNameById.js index 07aa6c3e2ef..897483d6950 100644 --- a/server/methods/getRoomNameById.js +++ b/server/methods/getRoomNameById.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms, Subscriptions } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Rooms, Subscriptions } from '../../app/models'; +import { hasPermission } from '../../app/authorization'; Meteor.methods({ getRoomNameById(rid) { diff --git a/server/methods/getTotalChannels.js b/server/methods/getTotalChannels.js index a01f6a2dd63..d1145c5fdc2 100644 --- a/server/methods/getTotalChannels.js +++ b/server/methods/getTotalChannels.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../app/models'; Meteor.methods({ getTotalChannels() { diff --git a/server/methods/getUsersOfRoom.js b/server/methods/getUsersOfRoom.js index 3d441707c15..e999182c455 100644 --- a/server/methods/getUsersOfRoom.js +++ b/server/methods/getUsersOfRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions } from '/app/models'; -import { hasPermission } from '/app/authorization'; +import { Subscriptions } from '../../app/models'; +import { hasPermission } from '../../app/authorization'; Meteor.methods({ async getUsersOfRoom(rid, showAll) { diff --git a/server/methods/hideRoom.js b/server/methods/hideRoom.js index e9b94dde9e7..b1beddd89aa 100644 --- a/server/methods/hideRoom.js +++ b/server/methods/hideRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../app/models'; Meteor.methods({ hideRoom(rid) { diff --git a/server/methods/ignoreUser.js b/server/methods/ignoreUser.js index 842c9966f71..d4dc0ee006a 100644 --- a/server/methods/ignoreUser.js +++ b/server/methods/ignoreUser.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../app/models'; Meteor.methods({ ignoreUser({ rid, userId: ignoredUser, ignore = true }) { diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js index 7cd40a17673..b0e9d3d628a 100644 --- a/server/methods/loadHistory.js +++ b/server/methods/loadHistory.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { loadMessageHistory } from '/app/lib'; +import { Subscriptions } from '../../app/models'; +import { hasPermission } from '../../app/authorization'; +import { settings } from '../../app/settings'; +import { loadMessageHistory } from '../../app/lib'; const hideMessagesOfType = []; diff --git a/server/methods/loadMissedMessages.js b/server/methods/loadMissedMessages.js index 1c1f15dc0ab..13a773e1102 100644 --- a/server/methods/loadMissedMessages.js +++ b/server/methods/loadMissedMessages.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; +import { Messages } from '../../app/models'; +import { settings } from '../../app/settings'; Meteor.methods({ loadMissedMessages(rid, start) { diff --git a/server/methods/loadNextMessages.js b/server/methods/loadNextMessages.js index 809c5ac52ad..11ee5a7d7cd 100644 --- a/server/methods/loadNextMessages.js +++ b/server/methods/loadNextMessages.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { composeMessageObjectWithUser } from '../../app/utils'; Meteor.methods({ loadNextMessages(rid, end, limit = 20) { diff --git a/server/methods/loadSurroundingMessages.js b/server/methods/loadSurroundingMessages.js index d799a93b3a0..f4dfe2e7a0c 100644 --- a/server/methods/loadSurroundingMessages.js +++ b/server/methods/loadSurroundingMessages.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { composeMessageObjectWithUser } from '/app/utils'; +import { Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { composeMessageObjectWithUser } from '../../app/utils'; Meteor.methods({ loadSurroundingMessages(message, limit = 50) { diff --git a/server/methods/logoutCleanUp.js b/server/methods/logoutCleanUp.js index 5c60c5ba1dc..37d3fd17a12 100644 --- a/server/methods/logoutCleanUp.js +++ b/server/methods/logoutCleanUp.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { callbacks } from '/app/callbacks'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ logoutCleanUp(user) { diff --git a/server/methods/messageSearch.js b/server/methods/messageSearch.js index bbddb343f42..6251d25852f 100644 --- a/server/methods/messageSearch.js +++ b/server/methods/messageSearch.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; +import { Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; import s from 'underscore.string'; Meteor.methods({ diff --git a/server/methods/migrate.js b/server/methods/migrate.js index 49dca7ba712..466eb433c37 100644 --- a/server/methods/migrate.js +++ b/server/methods/migrate.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Migrations } from '/app/migrations'; -import { hasPermission } from '/app/authorization'; +import { Migrations } from '../../app/migrations'; +import { hasPermission } from '../../app/authorization'; Meteor.methods({ migrateTo(version) { diff --git a/server/methods/muteUserInRoom.js b/server/methods/muteUserInRoom.js index f8682ff3da8..91b705a63bf 100644 --- a/server/methods/muteUserInRoom.js +++ b/server/methods/muteUserInRoom.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Rooms, Subscriptions, Users, Messages } from '/app/models'; -import { hasPermission } from '/app/authorization'; -import { callbacks } from '/app/callbacks'; +import { Rooms, Subscriptions, Users, Messages } from '../../app/models'; +import { hasPermission } from '../../app/authorization'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ muteUserInRoom(data) { diff --git a/server/methods/openRoom.js b/server/methods/openRoom.js index 064680ff75e..bd327f6c8ed 100644 --- a/server/methods/openRoom.js +++ b/server/methods/openRoom.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../app/models'; Meteor.methods({ openRoom(rid) { diff --git a/server/methods/readMessages.js b/server/methods/readMessages.js index fe5877a4289..331bf783d1a 100644 --- a/server/methods/readMessages.js +++ b/server/methods/readMessages.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { callbacks } from '/app/callbacks'; -import { Subscriptions } from '/app/models'; +import { callbacks } from '../../app/callbacks'; +import { Subscriptions } from '../../app/models'; Meteor.methods({ readMessages(rid) { diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js index e0eecef7de0..47a99242e3b 100644 --- a/server/methods/registerUser.js +++ b/server/methods/registerUser.js @@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; -import { saveCustomFields, validateEmailDomain, passwordPolicy } from '/app/lib'; +import * as Mailer from '../../app/mailer'; +import { Users } from '../../app/models'; +import { settings } from '../../app/settings'; +import { saveCustomFields, validateEmailDomain, passwordPolicy } from '../../app/lib'; let verifyEmailTemplate = ''; Meteor.startup(() => { diff --git a/server/methods/removeRoomLeader.js b/server/methods/removeRoomLeader.js index 659300e1532..90aebe4c38c 100644 --- a/server/methods/removeRoomLeader.js +++ b/server/methods/removeRoomLeader.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ removeRoomLeader(rid, userId) { diff --git a/server/methods/removeRoomModerator.js b/server/methods/removeRoomModerator.js index a39e5b05538..eea88e224af 100644 --- a/server/methods/removeRoomModerator.js +++ b/server/methods/removeRoomModerator.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ removeRoomModerator(rid, userId) { diff --git a/server/methods/removeRoomOwner.js b/server/methods/removeRoomOwner.js index b757e38f310..a818c5da2e8 100644 --- a/server/methods/removeRoomOwner.js +++ b/server/methods/removeRoomOwner.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { hasPermission, getUsersInRole } from '/app/authorization'; -import { Users, Subscriptions, Messages } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { hasPermission, getUsersInRole } from '../../app/authorization'; +import { Users, Subscriptions, Messages } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ removeRoomOwner(rid, userId) { diff --git a/server/methods/removeUserFromRoom.js b/server/methods/removeUserFromRoom.js index 25b676e7141..8f76c19f9eb 100644 --- a/server/methods/removeUserFromRoom.js +++ b/server/methods/removeUserFromRoom.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission, hasRole, getUsersInRole, removeUserFromRoles } from '/app/authorization'; -import { Users, Subscriptions, Rooms, Messages } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { hasPermission, hasRole, getUsersInRole, removeUserFromRoles } from '../../app/authorization'; +import { Users, Subscriptions, Rooms, Messages } from '../../app/models'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ removeUserFromRoom(data) { diff --git a/server/methods/reportMessage.js b/server/methods/reportMessage.js index 429e5831346..13c66136b8a 100644 --- a/server/methods/reportMessage.js +++ b/server/methods/reportMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Messages, Reports } from '/app/models'; +import { Messages, Reports } from '../../app/models'; Meteor.methods({ reportMessage(messageId, description) { diff --git a/server/methods/requestDataDownload.js b/server/methods/requestDataDownload.js index 03dbe1134d5..f1d444bf59e 100644 --- a/server/methods/requestDataDownload.js +++ b/server/methods/requestDataDownload.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { ExportOperations } from '/app/models'; -import { settings } from '/app/settings'; +import { ExportOperations } from '../../app/models'; +import { settings } from '../../app/settings'; import fs from 'fs'; import path from 'path'; diff --git a/server/methods/resetAvatar.js b/server/methods/resetAvatar.js index 51131201a01..06dc8160c44 100644 --- a/server/methods/resetAvatar.js +++ b/server/methods/resetAvatar.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { FileUpload } from '/app/file-upload'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { FileUpload } from '../../app/file-upload'; +import { Users } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; Meteor.methods({ resetAvatar() { diff --git a/server/methods/roomNameExists.js b/server/methods/roomNameExists.js index baefdbea767..5bb3e5e68dd 100644 --- a/server/methods/roomNameExists.js +++ b/server/methods/roomNameExists.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { Rooms } from '/app/models'; +import { Rooms } from '../../app/models'; Meteor.methods({ roomNameExists(rid) { diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js index 83309fea602..fd389a20a52 100644 --- a/server/methods/saveUserPreferences.js +++ b/server/methods/saveUserPreferences.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Users, Subscriptions } from '/app/models'; +import { Users, Subscriptions } from '../../app/models'; Meteor.methods({ saveUserPreferences(settings) { diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js index 8396adff315..429fdf4ccc0 100644 --- a/server/methods/saveUserProfile.js +++ b/server/methods/saveUserProfile.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; -import { saveCustomFields, passwordPolicy } from '/app/lib'; -import { Users } from '/app/models'; -import { settings as rcSettings } from '/app/settings'; +import { saveCustomFields, passwordPolicy } from '../../app/lib'; +import { Users } from '../../app/models'; +import { settings as rcSettings } from '../../app/settings'; Meteor.methods({ saveUserProfile(settings, customFields) { diff --git a/server/methods/sendConfirmationEmail.js b/server/methods/sendConfirmationEmail.js index 35dc00ad9eb..a2ee55be978 100644 --- a/server/methods/sendConfirmationEmail.js +++ b/server/methods/sendConfirmationEmail.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; -import * as Mailer from '/app/mailer'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import * as Mailer from '../../app/mailer'; +import { Users } from '../../app/models'; +import { settings } from '../../app/settings'; let subject = ''; let html = ''; diff --git a/server/methods/sendForgotPasswordEmail.js b/server/methods/sendForgotPasswordEmail.js index 5c43054660c..91fdb918b33 100644 --- a/server/methods/sendForgotPasswordEmail.js +++ b/server/methods/sendForgotPasswordEmail.js @@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; import s from 'underscore.string'; -import * as Mailer from '/app/mailer'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import * as Mailer from '../../app/mailer'; +import { Users } from '../../app/models'; +import { settings } from '../../app/settings'; let template = ''; diff --git a/server/methods/setAvatarFromService.js b/server/methods/setAvatarFromService.js index d5253f8b633..dc8ce21cd72 100644 --- a/server/methods/setAvatarFromService.js +++ b/server/methods/setAvatarFromService.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { settings } from '/app/settings'; -import { setUserAvatar } from '/app/lib'; +import { settings } from '../../app/settings'; +import { setUserAvatar } from '../../app/lib'; Meteor.methods({ setAvatarFromService(dataURI, contentType, service) { diff --git a/server/methods/setUserActiveStatus.js b/server/methods/setUserActiveStatus.js index e6784e61ab5..2577af9e4ed 100644 --- a/server/methods/setUserActiveStatus.js +++ b/server/methods/setUserActiveStatus.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; -import * as Mailer from '/app/mailer'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; +import * as Mailer from '../../app/mailer'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions } from '../../app/models'; +import { settings } from '../../app/settings'; Meteor.methods({ setUserActiveStatus(userId, active) { diff --git a/server/methods/setUserPassword.js b/server/methods/setUserPassword.js index 557e69da6fb..8f5c91eb941 100644 --- a/server/methods/setUserPassword.js +++ b/server/methods/setUserPassword.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { Accounts } from 'meteor/accounts-base'; -import { Users } from '/app/models'; -import { passwordPolicy } from '/app/lib'; +import { Users } from '../../app/models'; +import { passwordPolicy } from '../../app/lib'; Meteor.methods({ setUserPassword(password) { diff --git a/server/methods/toogleFavorite.js b/server/methods/toogleFavorite.js index 29fa42c94f3..82293eae4de 100644 --- a/server/methods/toogleFavorite.js +++ b/server/methods/toogleFavorite.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { Subscriptions } from '/app/models'; +import { Subscriptions } from '../../app/models'; Meteor.methods({ toggleFavorite(rid, f) { diff --git a/server/methods/unmuteUserInRoom.js b/server/methods/unmuteUserInRoom.js index f675f0c088b..2f9ce1266e2 100644 --- a/server/methods/unmuteUserInRoom.js +++ b/server/methods/unmuteUserInRoom.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Rooms, Messages } from '/app/models'; -import { callbacks } from '/app/callbacks'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Rooms, Messages } from '../../app/models'; +import { callbacks } from '../../app/callbacks'; Meteor.methods({ unmuteUserInRoom(data) { diff --git a/server/methods/userSetUtcOffset.js b/server/methods/userSetUtcOffset.js index e6c77f9149d..ad33d8c1a23 100644 --- a/server/methods/userSetUtcOffset.js +++ b/server/methods/userSetUtcOffset.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; Meteor.methods({ userSetUtcOffset(utcOffset) { diff --git a/server/publications/activeUsers.js b/server/publications/activeUsers.js index ade9463518e..180def537d0 100644 --- a/server/publications/activeUsers.js +++ b/server/publications/activeUsers.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; Meteor.publish('activeUsers', function() { if (!this.userId) { diff --git a/server/publications/channelAndPrivateAutocomplete.js b/server/publications/channelAndPrivateAutocomplete.js index 53d18546fa0..bda54b0bd32 100644 --- a/server/publications/channelAndPrivateAutocomplete.js +++ b/server/publications/channelAndPrivateAutocomplete.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Rooms } from '/app/models'; +import { hasPermission } from '../../app/authorization'; +import { Rooms } from '../../app/models'; Meteor.publish('channelAndPrivateAutocomplete', function(selector) { if (!this.userId) { diff --git a/server/publications/fullUserData.js b/server/publications/fullUserData.js index 5c10700eed4..aa6d2e9ccc5 100644 --- a/server/publications/fullUserData.js +++ b/server/publications/fullUserData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { getFullUserData } from '/app/lib'; +import { getFullUserData } from '../../app/lib'; Meteor.publish('fullUserData', function(filter, limit) { if (!this.userId) { diff --git a/server/publications/messages.js b/server/publications/messages.js index 82e69b8506a..4f9b306e3b0 100644 --- a/server/publications/messages.js +++ b/server/publications/messages.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; -import { composeMessageObjectWithUser } from '/app/utils'; -import { Messages } from '/app/models'; +import { composeMessageObjectWithUser } from '../../app/utils'; +import { Messages } from '../../app/models'; Meteor.publish('messages', function(rid/* , start*/) { if (!this.userId) { diff --git a/server/publications/room.js b/server/publications/room.js index fb8e5f025eb..89b80a99b48 100644 --- a/server/publications/room.js +++ b/server/publications/room.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; -import { roomTypes } from '/app/utils'; -import { hasPermission } from '/app/authorization'; -import { Rooms, Subscriptions } from '/app/models'; -import { settings } from '/app/settings'; -import { Notifications } from '/app/notifications'; +import { roomTypes } from '../../app/utils'; +import { hasPermission } from '../../app/authorization'; +import { Rooms, Subscriptions } from '../../app/models'; +import { settings } from '../../app/settings'; +import { Notifications } from '../../app/notifications'; import _ from 'underscore'; const fields = { diff --git a/server/publications/roomSubscriptionsByRole.js b/server/publications/roomSubscriptionsByRole.js index b2be8464bee..8d6d56feab5 100644 --- a/server/publications/roomSubscriptionsByRole.js +++ b/server/publications/roomSubscriptionsByRole.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions } from '/app/models'; +import { hasPermission } from '../../app/authorization'; +import { Subscriptions } from '../../app/models'; Meteor.publish('roomSubscriptionsByRole', function(rid, role) { if (!this.userId) { diff --git a/server/publications/spotlight.js b/server/publications/spotlight.js index 9051767eb1e..faa3b5e9318 100644 --- a/server/publications/spotlight.js +++ b/server/publications/spotlight.js @@ -1,9 +1,9 @@ import { Meteor } from 'meteor/meteor'; import { DDPRateLimiter } from 'meteor/ddp-rate-limiter'; -import { hasPermission } from '/app/authorization'; -import { Users, Subscriptions, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { roomTypes } from '/app/utils'; +import { hasPermission } from '../../app/authorization'; +import { Users, Subscriptions, Rooms } from '../../app/models'; +import { settings } from '../../app/settings'; +import { roomTypes } from '../../app/utils'; import s from 'underscore.string'; function fetchRooms(userId, rooms) { diff --git a/server/publications/subscription.js b/server/publications/subscription.js index d62ce6154ce..16324181370 100644 --- a/server/publications/subscription.js +++ b/server/publications/subscription.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Subscriptions } from '/app/models'; -import { Notifications } from '/app/notifications'; +import { Subscriptions } from '../../app/models'; +import { Notifications } from '../../app/notifications'; const fields = { t: 1, diff --git a/server/publications/userAutocomplete.js b/server/publications/userAutocomplete.js index 7e28fd7b48c..36f315f9aee 100644 --- a/server/publications/userAutocomplete.js +++ b/server/publications/userAutocomplete.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; import _ from 'underscore'; Meteor.publish('userAutocomplete', function(selector) { diff --git a/server/publications/userChannels.js b/server/publications/userChannels.js index 74b27198beb..e67e106975c 100644 --- a/server/publications/userChannels.js +++ b/server/publications/userChannels.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { Subscriptions } from '/app/models'; +import { hasPermission } from '../../app/authorization'; +import { Subscriptions } from '../../app/models'; Meteor.publish('userChannels', function(userId) { if (!this.userId) { diff --git a/server/publications/userData.js b/server/publications/userData.js index 250156a42c0..200db4b3c01 100644 --- a/server/publications/userData.js +++ b/server/publications/userData.js @@ -1,5 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import { Users } from '/app/models'; +import { Users } from '../../app/models'; Meteor.publish('userData', function() { if (!this.userId) { diff --git a/server/startup/avatar.js b/server/startup/avatar.js index 0ab606291f1..254a98dfc6e 100644 --- a/server/startup/avatar.js +++ b/server/startup/avatar.js @@ -3,10 +3,10 @@ import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; import sharp from 'sharp'; import { Cookies } from 'meteor/ostrio:cookies'; -import { FileUpload } from '/app/file-upload'; -import { getAvatarColor } from '/app/utils'; -import { Users, Avatars } from '/app/models'; -import { settings } from '/app/settings'; +import { FileUpload } from '../../app/file-upload'; +import { getAvatarColor } from '../../app/utils'; +import { Users, Avatars } from '../../app/models'; +import { settings } from '../../app/settings'; const cookie = new Cookies(); diff --git a/server/startup/cron.js b/server/startup/cron.js index c658f1e17fa..68eb4362b1e 100644 --- a/server/startup/cron.js +++ b/server/startup/cron.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { Logger } from '/app/logger'; -import { getWorkspaceAccessToken } from '/app/cloud'; +import { Logger } from '../../app/logger'; +import { getWorkspaceAccessToken } from '../../app/cloud'; import { SyncedCron } from 'meteor/littledata:synced-cron'; -import { statistics } from '/app/statistics'; -import { settings } from '/app/settings'; +import { statistics } from '../../app/statistics'; +import { settings } from '../../app/settings'; const logger = new Logger('SyncedCron'); diff --git a/server/startup/initialData.js b/server/startup/initialData.js index dea1f78fcdf..3c24330b58b 100644 --- a/server/startup/initialData.js +++ b/server/startup/initialData.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; -import { RocketChatFile } from '/app/file'; -import { FileUpload } from '/app/file-upload'; -import { addUserRoles, getUsersInRole } from '/app/authorization'; -import { Users, Settings, Rooms } from '/app/models'; -import { settings } from '/app/settings'; -import { checkUsernameAvailability, addUserToDefaultChannels } from '/app/lib'; +import { RocketChatFile } from '../../app/file'; +import { FileUpload } from '../../app/file-upload'; +import { addUserRoles, getUsersInRole } from '../../app/authorization'; +import { Users, Settings, Rooms } from '../../app/models'; +import { settings } from '../../app/settings'; +import { checkUsernameAvailability, addUserToDefaultChannels } from '../../app/lib'; import _ from 'underscore'; Meteor.startup(function() { diff --git a/server/startup/migrations/v001.js b/server/startup/migrations/v001.js index b9b66f1a486..6dd91abeaf1 100644 --- a/server/startup/migrations/v001.js +++ b/server/startup/migrations/v001.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; -import { generateUsernameSuggestion } from '/app/lib'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; +import { generateUsernameSuggestion } from '../../../app/lib'; Migrations.add({ version: 1, diff --git a/server/startup/migrations/v002.js b/server/startup/migrations/v002.js index 175d4a5c9aa..66c311ee2d7 100644 --- a/server/startup/migrations/v002.js +++ b/server/startup/migrations/v002.js @@ -1,8 +1,8 @@ -import { RocketChatFile } from '/app/file'; -import { FileUpload } from '/app/file-upload'; -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; -import { getAvatarSuggestionForUser } from '/app/lib'; +import { RocketChatFile } from '../../../app/file'; +import { FileUpload } from '../../../app/file-upload'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; +import { getAvatarSuggestionForUser } from '../../../app/lib'; Migrations.add({ version: 2, diff --git a/server/startup/migrations/v003.js b/server/startup/migrations/v003.js index abced5b7c0f..29b62da5352 100644 --- a/server/startup/migrations/v003.js +++ b/server/startup/migrations/v003.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions, Rooms, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions, Rooms, Messages } from '../../../app/models'; Migrations.add({ version: 3, diff --git a/server/startup/migrations/v004.js b/server/startup/migrations/v004.js index e12162fb050..81d6e02165a 100644 --- a/server/startup/migrations/v004.js +++ b/server/startup/migrations/v004.js @@ -1,6 +1,6 @@ import { Random } from 'meteor/random'; -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Messages } from '../../../app/models'; Migrations.add({ version: 4, diff --git a/server/startup/migrations/v005.js b/server/startup/migrations/v005.js index e3e8d2c1ed2..b9576ee661f 100644 --- a/server/startup/migrations/v005.js +++ b/server/startup/migrations/v005.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Messages, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Messages, Users } from '../../../app/models'; Migrations.add({ version: 5, diff --git a/server/startup/migrations/v006.js b/server/startup/migrations/v006.js index 30964c82768..91b623f60fc 100644 --- a/server/startup/migrations/v006.js +++ b/server/startup/migrations/v006.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Messages } from '../../../app/models'; Migrations.add({ version: 6, diff --git a/server/startup/migrations/v007.js b/server/startup/migrations/v007.js index 444b709630f..9da47092726 100644 --- a/server/startup/migrations/v007.js +++ b/server/startup/migrations/v007.js @@ -1,6 +1,6 @@ -import { OEmbed } from '/app/oembed'; -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { OEmbed } from '../../../app/oembed'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; import _ from 'underscore'; Migrations.add({ diff --git a/server/startup/migrations/v008.js b/server/startup/migrations/v008.js index 3dcf86037c3..62e1a5c3ae0 100644 --- a/server/startup/migrations/v008.js +++ b/server/startup/migrations/v008.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 8, diff --git a/server/startup/migrations/v009.js b/server/startup/migrations/v009.js index c788a7b742b..98574e9688e 100644 --- a/server/startup/migrations/v009.js +++ b/server/startup/migrations/v009.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Messages, Settings, OEmbedCache } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Messages, Settings, OEmbedCache } from '../../../app/models'; Migrations.add({ version: 9, diff --git a/server/startup/migrations/v010.js b/server/startup/migrations/v010.js index 7451c887b7c..b6b96a037c9 100644 --- a/server/startup/migrations/v010.js +++ b/server/startup/migrations/v010.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms } from '../../../app/models'; import _ from 'underscore'; Migrations.add({ diff --git a/server/startup/migrations/v011.js b/server/startup/migrations/v011.js index ecc30025d31..4c243336dc2 100644 --- a/server/startup/migrations/v011.js +++ b/server/startup/migrations/v011.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms } from '../../../app/models'; Migrations.add({ version: 11, diff --git a/server/startup/migrations/v012.js b/server/startup/migrations/v012.js index 337b0df32b8..d048552a4df 100644 --- a/server/startup/migrations/v012.js +++ b/server/startup/migrations/v012.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 12, diff --git a/server/startup/migrations/v013.js b/server/startup/migrations/v013.js index 87265e49241..860f0b665d3 100644 --- a/server/startup/migrations/v013.js +++ b/server/startup/migrations/v013.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 13, diff --git a/server/startup/migrations/v014.js b/server/startup/migrations/v014.js index 8102c9da9ec..f9f10a9276d 100644 --- a/server/startup/migrations/v014.js +++ b/server/startup/migrations/v014.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 14, diff --git a/server/startup/migrations/v015.js b/server/startup/migrations/v015.js index e4fa51371fa..0410e14eded 100644 --- a/server/startup/migrations/v015.js +++ b/server/startup/migrations/v015.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; -import { Migrations } from '/app/migrations'; -import { Uploads, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Uploads, Messages } from '../../../app/models'; Migrations.add({ version: 15, diff --git a/server/startup/migrations/v016.js b/server/startup/migrations/v016.js index 91b1017d0e8..9029faabf56 100644 --- a/server/startup/migrations/v016.js +++ b/server/startup/migrations/v016.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 16, diff --git a/server/startup/migrations/v017.js b/server/startup/migrations/v017.js index dc0c1913623..ddeecf08e07 100644 --- a/server/startup/migrations/v017.js +++ b/server/startup/migrations/v017.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 17, diff --git a/server/startup/migrations/v018.js b/server/startup/migrations/v018.js index 171328cf4f1..5a8181a121b 100644 --- a/server/startup/migrations/v018.js +++ b/server/startup/migrations/v018.js @@ -1,6 +1,6 @@ import { ServiceConfiguration } from 'meteor/service-configuration'; -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 18, diff --git a/server/startup/migrations/v019.js b/server/startup/migrations/v019.js index 144d22b294c..0e5deed8a79 100644 --- a/server/startup/migrations/v019.js +++ b/server/startup/migrations/v019.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; -import { Migrations } from '/app/migrations'; -import { addUserRoles } from '/app/authorization'; -import { Rooms, Subscriptions, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { addUserRoles } from '../../../app/authorization'; +import { Rooms, Subscriptions, Messages } from '../../../app/models'; import _ from 'underscore'; Migrations.add({ diff --git a/server/startup/migrations/v020.js b/server/startup/migrations/v020.js index 0b75d1da700..a4c763e653c 100644 --- a/server/startup/migrations/v020.js +++ b/server/startup/migrations/v020.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages, Uploads } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages, Uploads } from '../../../app/models'; Migrations.add({ version: 20, diff --git a/server/startup/migrations/v021.js b/server/startup/migrations/v021.js index e879c6c1411..bda72ae8d63 100644 --- a/server/startup/migrations/v021.js +++ b/server/startup/migrations/v021.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 21, diff --git a/server/startup/migrations/v022.js b/server/startup/migrations/v022.js index 854c821cbe4..54402d34011 100644 --- a/server/startup/migrations/v022.js +++ b/server/startup/migrations/v022.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 22, diff --git a/server/startup/migrations/v023.js b/server/startup/migrations/v023.js index e7695da461b..15ba89d2c72 100644 --- a/server/startup/migrations/v023.js +++ b/server/startup/migrations/v023.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 23, diff --git a/server/startup/migrations/v024.js b/server/startup/migrations/v024.js index 6806ee86143..8f52160156e 100644 --- a/server/startup/migrations/v024.js +++ b/server/startup/migrations/v024.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 24, diff --git a/server/startup/migrations/v025.js b/server/startup/migrations/v025.js index 25597618050..99794d8bfc9 100644 --- a/server/startup/migrations/v025.js +++ b/server/startup/migrations/v025.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 25, diff --git a/server/startup/migrations/v026.js b/server/startup/migrations/v026.js index 493e1e525c5..efcc2aa0fb7 100644 --- a/server/startup/migrations/v026.js +++ b/server/startup/migrations/v026.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 26, diff --git a/server/startup/migrations/v027.js b/server/startup/migrations/v027.js index d1ca8cee8c5..49fd58e71c6 100644 --- a/server/startup/migrations/v027.js +++ b/server/startup/migrations/v027.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Roles } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Roles } from '../../../app/models'; Migrations.add({ version: 27, diff --git a/server/startup/migrations/v028.js b/server/startup/migrations/v028.js index 10e9c4435c6..c8627c59ec1 100644 --- a/server/startup/migrations/v028.js +++ b/server/startup/migrations/v028.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 28, diff --git a/server/startup/migrations/v029.js b/server/startup/migrations/v029.js index d2647d569d3..61038bf4396 100644 --- a/server/startup/migrations/v029.js +++ b/server/startup/migrations/v029.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 29, diff --git a/server/startup/migrations/v030.js b/server/startup/migrations/v030.js index 2ad21258f0c..c8a4d32d6a5 100644 --- a/server/startup/migrations/v030.js +++ b/server/startup/migrations/v030.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 30, diff --git a/server/startup/migrations/v031.js b/server/startup/migrations/v031.js index b0dc51433d9..a58dcfa8dd6 100644 --- a/server/startup/migrations/v031.js +++ b/server/startup/migrations/v031.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 31, diff --git a/server/startup/migrations/v032.js b/server/startup/migrations/v032.js index bc702cbdb26..ee01ae93b63 100644 --- a/server/startup/migrations/v032.js +++ b/server/startup/migrations/v032.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 32, diff --git a/server/startup/migrations/v033.js b/server/startup/migrations/v033.js index 45c6de38dc2..8d38362a99c 100644 --- a/server/startup/migrations/v033.js +++ b/server/startup/migrations/v033.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Integrations } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Integrations } from '../../../app/models'; Migrations.add({ version: 33, diff --git a/server/startup/migrations/v034.js b/server/startup/migrations/v034.js index 2ad370e9be7..57ae5ac09a7 100644 --- a/server/startup/migrations/v034.js +++ b/server/startup/migrations/v034.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 34, diff --git a/server/startup/migrations/v035.js b/server/startup/migrations/v035.js index 08047779ac6..34d0e5aeda4 100644 --- a/server/startup/migrations/v035.js +++ b/server/startup/migrations/v035.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 35, diff --git a/server/startup/migrations/v036.js b/server/startup/migrations/v036.js index 0e60dbffd40..e73d28b5a26 100644 --- a/server/startup/migrations/v036.js +++ b/server/startup/migrations/v036.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; -import { RocketChatAssets } from '/app/assets'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; +import { RocketChatAssets } from '../../../app/assets'; import url from 'url'; Migrations.add({ diff --git a/server/startup/migrations/v037.js b/server/startup/migrations/v037.js index c95009698aa..8ce42c36482 100644 --- a/server/startup/migrations/v037.js +++ b/server/startup/migrations/v037.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 37, diff --git a/server/startup/migrations/v038.js b/server/startup/migrations/v038.js index 71b09dd8056..5391a0689d6 100644 --- a/server/startup/migrations/v038.js +++ b/server/startup/migrations/v038.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; -import { settings } from '/app/settings'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; +import { settings } from '../../../app/settings'; Migrations.add({ version: 38, diff --git a/server/startup/migrations/v039.js b/server/startup/migrations/v039.js index 42967a2d08d..a9c08dc4047 100644 --- a/server/startup/migrations/v039.js +++ b/server/startup/migrations/v039.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 39, diff --git a/server/startup/migrations/v040.js b/server/startup/migrations/v040.js index 3d494a5f114..96597e582a4 100644 --- a/server/startup/migrations/v040.js +++ b/server/startup/migrations/v040.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 40, diff --git a/server/startup/migrations/v041.js b/server/startup/migrations/v041.js index d24ab2d7fb6..047ce1511c5 100644 --- a/server/startup/migrations/v041.js +++ b/server/startup/migrations/v041.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 41, diff --git a/server/startup/migrations/v042.js b/server/startup/migrations/v042.js index 0c775b459bc..69578835174 100644 --- a/server/startup/migrations/v042.js +++ b/server/startup/migrations/v042.js @@ -1,7 +1,7 @@ import { Mongo } from 'meteor/mongo'; -import { Migrations } from '/app/migrations'; -import { settings } from '/app/settings'; -import { RocketChatAssets } from '/app/assets'; +import { Migrations } from '../../../app/migrations'; +import { settings } from '../../../app/settings'; +import { RocketChatAssets } from '../../../app/assets'; Migrations.add({ version: 42, diff --git a/server/startup/migrations/v043.js b/server/startup/migrations/v043.js index 6966c31c96c..9dbee1e065a 100644 --- a/server/startup/migrations/v043.js +++ b/server/startup/migrations/v043.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 43, diff --git a/server/startup/migrations/v044.js b/server/startup/migrations/v044.js index 61ff9e99a89..3031ecb6807 100644 --- a/server/startup/migrations/v044.js +++ b/server/startup/migrations/v044.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Settings } from '../../../app/models'; Migrations.add({ version: 44, diff --git a/server/startup/migrations/v045.js b/server/startup/migrations/v045.js index 6f11a550e50..806520def56 100644 --- a/server/startup/migrations/v045.js +++ b/server/startup/migrations/v045.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; -import { settings } from '/app/settings'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; +import { settings } from '../../../app/settings'; Migrations.add({ version: 45, diff --git a/server/startup/migrations/v046.js b/server/startup/migrations/v046.js index 7266706f0b3..a0555711456 100644 --- a/server/startup/migrations/v046.js +++ b/server/startup/migrations/v046.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 46, diff --git a/server/startup/migrations/v047.js b/server/startup/migrations/v047.js index decc44cd698..fb570ec4349 100644 --- a/server/startup/migrations/v047.js +++ b/server/startup/migrations/v047.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 47, diff --git a/server/startup/migrations/v048.js b/server/startup/migrations/v048.js index 90f92ebb618..50e624e8ee3 100644 --- a/server/startup/migrations/v048.js +++ b/server/startup/migrations/v048.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 48, diff --git a/server/startup/migrations/v049.js b/server/startup/migrations/v049.js index c078084888b..802153d692c 100644 --- a/server/startup/migrations/v049.js +++ b/server/startup/migrations/v049.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Settings } from '../../../app/models'; Migrations.add({ version: 49, diff --git a/server/startup/migrations/v050.js b/server/startup/migrations/v050.js index 35053f99bab..7f956b323cd 100644 --- a/server/startup/migrations/v050.js +++ b/server/startup/migrations/v050.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions } from '../../../app/models'; Migrations.add({ version: 50, diff --git a/server/startup/migrations/v051.js b/server/startup/migrations/v051.js index d34f934df28..c456176ba61 100644 --- a/server/startup/migrations/v051.js +++ b/server/startup/migrations/v051.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Rooms, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Rooms, Subscriptions } from '../../../app/models'; Migrations.add({ version: 51, diff --git a/server/startup/migrations/v052.js b/server/startup/migrations/v052.js index 057e9b37045..68ad408bb85 100644 --- a/server/startup/migrations/v052.js +++ b/server/startup/migrations/v052.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 52, diff --git a/server/startup/migrations/v053.js b/server/startup/migrations/v053.js index 6ac7a0880f5..120c5608b70 100644 --- a/server/startup/migrations/v053.js +++ b/server/startup/migrations/v053.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 53, diff --git a/server/startup/migrations/v054.js b/server/startup/migrations/v054.js index b9e69a7b3ce..4f4a6db278f 100644 --- a/server/startup/migrations/v054.js +++ b/server/startup/migrations/v054.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 54, diff --git a/server/startup/migrations/v055.js b/server/startup/migrations/v055.js index f0523545f43..51b57b203c9 100644 --- a/server/startup/migrations/v055.js +++ b/server/startup/migrations/v055.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Messages } from '../../../app/models'; import s from 'underscore.string'; Migrations.add({ diff --git a/server/startup/migrations/v056.js b/server/startup/migrations/v056.js index 6d2e4244568..d22812f707d 100644 --- a/server/startup/migrations/v056.js +++ b/server/startup/migrations/v056.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 56, diff --git a/server/startup/migrations/v057.js b/server/startup/migrations/v057.js index 755e1905594..802e68357c6 100644 --- a/server/startup/migrations/v057.js +++ b/server/startup/migrations/v057.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 57, diff --git a/server/startup/migrations/v058.js b/server/startup/migrations/v058.js index 07dc63a9ba3..501f9fb51d8 100644 --- a/server/startup/migrations/v058.js +++ b/server/startup/migrations/v058.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 58, diff --git a/server/startup/migrations/v059.js b/server/startup/migrations/v059.js index 8b3323322af..df5f821178b 100644 --- a/server/startup/migrations/v059.js +++ b/server/startup/migrations/v059.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Settings, Statistics } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Settings, Statistics } from '../../../app/models'; Migrations.add({ version: 59, diff --git a/server/startup/migrations/v060.js b/server/startup/migrations/v060.js index 7d194876ede..d9be7e5a7c5 100644 --- a/server/startup/migrations/v060.js +++ b/server/startup/migrations/v060.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions } from '../../../app/models'; import _ from 'underscore'; Migrations.add({ diff --git a/server/startup/migrations/v061.js b/server/startup/migrations/v061.js index 81c47e8654a..e8dab7d2563 100644 --- a/server/startup/migrations/v061.js +++ b/server/startup/migrations/v061.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions } from '../../../app/models'; Migrations.add({ version: 61, diff --git a/server/startup/migrations/v062.js b/server/startup/migrations/v062.js index 12078c82036..43da57c4959 100644 --- a/server/startup/migrations/v062.js +++ b/server/startup/migrations/v062.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 62, diff --git a/server/startup/migrations/v063.js b/server/startup/migrations/v063.js index 39abbdeda60..4b5b4bcc79c 100644 --- a/server/startup/migrations/v063.js +++ b/server/startup/migrations/v063.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 63, diff --git a/server/startup/migrations/v064.js b/server/startup/migrations/v064.js index b5f0ec04435..b5d73f096db 100644 --- a/server/startup/migrations/v064.js +++ b/server/startup/migrations/v064.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; import s from 'underscore.string'; Migrations.add({ diff --git a/server/startup/migrations/v065.js b/server/startup/migrations/v065.js index 1c5fb8859b3..96b5aea12e7 100644 --- a/server/startup/migrations/v065.js +++ b/server/startup/migrations/v065.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 65, diff --git a/server/startup/migrations/v066.js b/server/startup/migrations/v066.js index ef6aecb1652..d111515a8a5 100644 --- a/server/startup/migrations/v066.js +++ b/server/startup/migrations/v066.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 66, diff --git a/server/startup/migrations/v067.js b/server/startup/migrations/v067.js index a4e7604eadb..d627bcbb7a0 100644 --- a/server/startup/migrations/v067.js +++ b/server/startup/migrations/v067.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { LivechatDepartment } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { LivechatDepartment } from '../../../app/models'; Migrations.add({ version: 67, diff --git a/server/startup/migrations/v068.js b/server/startup/migrations/v068.js index 5585075a08a..0eaa26b0c54 100644 --- a/server/startup/migrations/v068.js +++ b/server/startup/migrations/v068.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 68, diff --git a/server/startup/migrations/v069.js b/server/startup/migrations/v069.js index c18bb3684fd..54b03945b2a 100644 --- a/server/startup/migrations/v069.js +++ b/server/startup/migrations/v069.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 69, diff --git a/server/startup/migrations/v070.js b/server/startup/migrations/v070.js index 887f6ba6f51..1e7d1b9e2dd 100644 --- a/server/startup/migrations/v070.js +++ b/server/startup/migrations/v070.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 70, diff --git a/server/startup/migrations/v071.js b/server/startup/migrations/v071.js index ba47f91b3c5..f4b202e4d46 100644 --- a/server/startup/migrations/v071.js +++ b/server/startup/migrations/v071.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages } from '../../../app/models'; Migrations.add({ version: 71, diff --git a/server/startup/migrations/v072.js b/server/startup/migrations/v072.js index 35951414dfe..bc91314b406 100644 --- a/server/startup/migrations/v072.js +++ b/server/startup/migrations/v072.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 72, diff --git a/server/startup/migrations/v073.js b/server/startup/migrations/v073.js index 6bda02ff3ba..c6f3b782e1b 100644 --- a/server/startup/migrations/v073.js +++ b/server/startup/migrations/v073.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 73, diff --git a/server/startup/migrations/v074.js b/server/startup/migrations/v074.js index 0eb2884b13f..a15504adc7f 100644 --- a/server/startup/migrations/v074.js +++ b/server/startup/migrations/v074.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 74, diff --git a/server/startup/migrations/v075.js b/server/startup/migrations/v075.js index 760646fa103..25b88b9cebd 100644 --- a/server/startup/migrations/v075.js +++ b/server/startup/migrations/v075.js @@ -1,4 +1,4 @@ -import { Migrations } from '/app/migrations'; +import { Migrations } from '../../../app/migrations'; import { ServiceConfiguration } from 'meteor/service-configuration'; Migrations.add({ diff --git a/server/startup/migrations/v076.js b/server/startup/migrations/v076.js index bd597b8f49c..2d2b7948072 100644 --- a/server/startup/migrations/v076.js +++ b/server/startup/migrations/v076.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 76, diff --git a/server/startup/migrations/v077.js b/server/startup/migrations/v077.js index d108fbb0e9d..b9cafc473ee 100644 --- a/server/startup/migrations/v077.js +++ b/server/startup/migrations/v077.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Users } from '../../../app/models'; Migrations.add({ version: 77, diff --git a/server/startup/migrations/v078.js b/server/startup/migrations/v078.js index a3ca6b547ea..8255f4b2c3b 100644 --- a/server/startup/migrations/v078.js +++ b/server/startup/migrations/v078.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 78, diff --git a/server/startup/migrations/v079.js b/server/startup/migrations/v079.js index 83326db5ad0..5365ef5b9f8 100644 --- a/server/startup/migrations/v079.js +++ b/server/startup/migrations/v079.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Integrations } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Integrations } from '../../../app/models'; Migrations.add({ version: 79, diff --git a/server/startup/migrations/v080.js b/server/startup/migrations/v080.js index 8eee7a5dc86..386a721ae9b 100644 --- a/server/startup/migrations/v080.js +++ b/server/startup/migrations/v080.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Integrations } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Integrations } from '../../../app/models'; Migrations.add({ version: 80, diff --git a/server/startup/migrations/v081.js b/server/startup/migrations/v081.js index 4a933facb34..48113f64fca 100644 --- a/server/startup/migrations/v081.js +++ b/server/startup/migrations/v081.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { OAuthApps } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { OAuthApps } from '../../../app/models'; Migrations.add({ version: 81, diff --git a/server/startup/migrations/v082.js b/server/startup/migrations/v082.js index d792b847dcd..04be1be9b9b 100644 --- a/server/startup/migrations/v082.js +++ b/server/startup/migrations/v082.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { getUsersInRole, removeUserFromRoles } from '/app/authorization'; +import { Migrations } from '../../../app/migrations'; +import { getUsersInRole, removeUserFromRoles } from '../../../app/authorization'; Migrations.add({ version: 82, diff --git a/server/startup/migrations/v083.js b/server/startup/migrations/v083.js index cb5cbbb6362..4e0125f4152 100644 --- a/server/startup/migrations/v083.js +++ b/server/startup/migrations/v083.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings, Users } from '../../../app/models'; Migrations.add({ version: 83, diff --git a/server/startup/migrations/v084.js b/server/startup/migrations/v084.js index d8cf0518807..e36683c8847 100644 --- a/server/startup/migrations/v084.js +++ b/server/startup/migrations/v084.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 84, diff --git a/server/startup/migrations/v085.js b/server/startup/migrations/v085.js index 354a474c080..94d7314be59 100644 --- a/server/startup/migrations/v085.js +++ b/server/startup/migrations/v085.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions } from '../../../app/models'; Migrations.add({ version: 85, diff --git a/server/startup/migrations/v086.js b/server/startup/migrations/v086.js index da893d6a0a8..4df7f3df836 100644 --- a/server/startup/migrations/v086.js +++ b/server/startup/migrations/v086.js @@ -1,4 +1,4 @@ -import { Migrations } from '/app/migrations'; +import { Migrations } from '../../../app/migrations'; Migrations.add({ version: 86, diff --git a/server/startup/migrations/v087.js b/server/startup/migrations/v087.js index 034619855d4..30c5b183fd6 100644 --- a/server/startup/migrations/v087.js +++ b/server/startup/migrations/v087.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 87, diff --git a/server/startup/migrations/v088.js b/server/startup/migrations/v088.js index 4149344ca83..b2d7624484f 100644 --- a/server/startup/migrations/v088.js +++ b/server/startup/migrations/v088.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 88, diff --git a/server/startup/migrations/v089.js b/server/startup/migrations/v089.js index 8e965197c67..d20a088164d 100644 --- a/server/startup/migrations/v089.js +++ b/server/startup/migrations/v089.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Integrations } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Integrations } from '../../../app/models'; Migrations.add({ version: 89, diff --git a/server/startup/migrations/v090.js b/server/startup/migrations/v090.js index 083c406d1c0..4963f936b23 100644 --- a/server/startup/migrations/v090.js +++ b/server/startup/migrations/v090.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 90, diff --git a/server/startup/migrations/v091.js b/server/startup/migrations/v091.js index 289b4db258a..e1d518828ab 100644 --- a/server/startup/migrations/v091.js +++ b/server/startup/migrations/v091.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 91, diff --git a/server/startup/migrations/v092.js b/server/startup/migrations/v092.js index 82dd94602d0..e6a05921fba 100644 --- a/server/startup/migrations/v092.js +++ b/server/startup/migrations/v092.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Integrations } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Integrations } from '../../../app/models'; Migrations.add({ version: 92, diff --git a/server/startup/migrations/v093.js b/server/startup/migrations/v093.js index 5c8c82b1c33..6a67b1b2ccd 100644 --- a/server/startup/migrations/v093.js +++ b/server/startup/migrations/v093.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings, Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings, Permissions } from '../../../app/models'; Migrations.add({ version: 93, diff --git a/server/startup/migrations/v094.js b/server/startup/migrations/v094.js index 4a41e6a2f8a..26682ee6b85 100644 --- a/server/startup/migrations/v094.js +++ b/server/startup/migrations/v094.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 94, diff --git a/server/startup/migrations/v095.js b/server/startup/migrations/v095.js index 8fa20261195..99446162dc0 100644 --- a/server/startup/migrations/v095.js +++ b/server/startup/migrations/v095.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 95, diff --git a/server/startup/migrations/v096.js b/server/startup/migrations/v096.js index 883e0a2ab79..ec2bb72f7cf 100644 --- a/server/startup/migrations/v096.js +++ b/server/startup/migrations/v096.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 96, diff --git a/server/startup/migrations/v097.js b/server/startup/migrations/v097.js index 33419746d47..23ed9209a69 100644 --- a/server/startup/migrations/v097.js +++ b/server/startup/migrations/v097.js @@ -1,4 +1,4 @@ -import { Migrations } from '/app/migrations'; +import { Migrations } from '../../../app/migrations'; Migrations.add({ version: 97, diff --git a/server/startup/migrations/v098.js b/server/startup/migrations/v098.js index e29fb4c8e4f..15082a2d140 100644 --- a/server/startup/migrations/v098.js +++ b/server/startup/migrations/v098.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { OAuthApps } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { OAuthApps } from '../../../app/models'; Migrations.add({ version: 98, diff --git a/server/startup/migrations/v099.js b/server/startup/migrations/v099.js index 015414512e2..df216ca8626 100644 --- a/server/startup/migrations/v099.js +++ b/server/startup/migrations/v099.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; import { Match } from 'meteor/check'; import { Mongo } from 'meteor/mongo'; -import { RocketChatFile } from '/app/file'; -import { SystemLogger } from '/app/logger'; -import { FileUpload } from '/app/file-upload'; -import { Migrations } from '/app/migrations'; -import { Uploads, Settings, Users } from '/app/models'; +import { RocketChatFile } from '../../../app/file'; +import { SystemLogger } from '../../../app/logger'; +import { FileUpload } from '../../../app/file-upload'; +import { Migrations } from '../../../app/migrations'; +import { Uploads, Settings, Users } from '../../../app/models'; import fs from 'fs'; import path from 'path'; diff --git a/server/startup/migrations/v100.js b/server/startup/migrations/v100.js index 88ba487a5f8..8d7244fbfc7 100644 --- a/server/startup/migrations/v100.js +++ b/server/startup/migrations/v100.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions } from '../../../app/models'; Migrations.add({ version: 100, diff --git a/server/startup/migrations/v101.js b/server/startup/migrations/v101.js index 899573f708f..7606bfc9ed6 100644 --- a/server/startup/migrations/v101.js +++ b/server/startup/migrations/v101.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions } from '../../../app/models'; Migrations.add({ version: 101, diff --git a/server/startup/migrations/v102.js b/server/startup/migrations/v102.js index f06139f82a7..8babda964b1 100644 --- a/server/startup/migrations/v102.js +++ b/server/startup/migrations/v102.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 102, diff --git a/server/startup/migrations/v103.js b/server/startup/migrations/v103.js index 08999325220..c9efdac2b95 100644 --- a/server/startup/migrations/v103.js +++ b/server/startup/migrations/v103.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; const majorColors = { 'content-background-color': '#FFFFFF', diff --git a/server/startup/migrations/v104.js b/server/startup/migrations/v104.js index b6294879423..011027cb926 100644 --- a/server/startup/migrations/v104.js +++ b/server/startup/migrations/v104.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 104, diff --git a/server/startup/migrations/v105.js b/server/startup/migrations/v105.js index b6fb248a8bd..d68b1bdda5e 100644 --- a/server/startup/migrations/v105.js +++ b/server/startup/migrations/v105.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Settings } from '../../../app/models'; Migrations.add({ version: 105, diff --git a/server/startup/migrations/v106.js b/server/startup/migrations/v106.js index 48e418d2c4f..a88641621de 100644 --- a/server/startup/migrations/v106.js +++ b/server/startup/migrations/v106.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { LivechatVisitors } from '/app/models'; -import { Migrations } from '/app/migrations'; +import { LivechatVisitors } from '../../../app/models'; +import { Migrations } from '../../../app/migrations'; Migrations.add({ version: 106, diff --git a/server/startup/migrations/v107.js b/server/startup/migrations/v107.js index 7f7695be246..657f746b390 100644 --- a/server/startup/migrations/v107.js +++ b/server/startup/migrations/v107.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 107, diff --git a/server/startup/migrations/v108.js b/server/startup/migrations/v108.js index 4b9372d8966..2bc8c3bd147 100644 --- a/server/startup/migrations/v108.js +++ b/server/startup/migrations/v108.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions, Roles } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions, Roles } from '../../../app/models'; Migrations.add({ version: 108, diff --git a/server/startup/migrations/v109.js b/server/startup/migrations/v109.js index a8a32c5515d..6f5ed1ed689 100644 --- a/server/startup/migrations/v109.js +++ b/server/startup/migrations/v109.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 109, diff --git a/server/startup/migrations/v110.js b/server/startup/migrations/v110.js index 7d258b52d6d..75b26370f83 100644 --- a/server/startup/migrations/v110.js +++ b/server/startup/migrations/v110.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings, Users } from '../../../app/models'; Migrations.add({ version: 110, diff --git a/server/startup/migrations/v111.js b/server/startup/migrations/v111.js index e1526714720..c5113431536 100644 --- a/server/startup/migrations/v111.js +++ b/server/startup/migrations/v111.js @@ -1,6 +1,6 @@ // Migration to give delete channel, delete group permissions to owner -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 111, diff --git a/server/startup/migrations/v112.js b/server/startup/migrations/v112.js index d8720f2254b..9db2cae3d5e 100644 --- a/server/startup/migrations/v112.js +++ b/server/startup/migrations/v112.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings, Users } from '../../../app/models'; Migrations.add({ version: 112, diff --git a/server/startup/migrations/v113.js b/server/startup/migrations/v113.js index d9a05e02dbe..ef4241cab12 100644 --- a/server/startup/migrations/v113.js +++ b/server/startup/migrations/v113.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Uploads, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Uploads, Messages } from '../../../app/models'; Migrations.add({ version: 113, diff --git a/server/startup/migrations/v114.js b/server/startup/migrations/v114.js index 8351eafe67a..2e86b71b635 100644 --- a/server/startup/migrations/v114.js +++ b/server/startup/migrations/v114.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 114, diff --git a/server/startup/migrations/v115.js b/server/startup/migrations/v115.js index 4973a5dddc4..2eb6cfc2e05 100644 --- a/server/startup/migrations/v115.js +++ b/server/startup/migrations/v115.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms } from '../../../app/models'; Migrations.add({ version: 115, diff --git a/server/startup/migrations/v116.js b/server/startup/migrations/v116.js index cbc61ff4128..80d3e612c09 100644 --- a/server/startup/migrations/v116.js +++ b/server/startup/migrations/v116.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions, Users } from '../../../app/models'; Migrations.add({ version: 116, diff --git a/server/startup/migrations/v117.js b/server/startup/migrations/v117.js index 9dffd54810c..e1d1c11f514 100644 --- a/server/startup/migrations/v117.js +++ b/server/startup/migrations/v117.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; -import { getUsersInRole } from '/app/authorization'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; +import { getUsersInRole } from '../../../app/authorization'; Migrations.add({ version: 117, diff --git a/server/startup/migrations/v118.js b/server/startup/migrations/v118.js index 4aa71213c67..a919d7aeba3 100644 --- a/server/startup/migrations/v118.js +++ b/server/startup/migrations/v118.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions, Settings, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions, Settings, Users } from '../../../app/models'; Migrations.add({ version: 118, diff --git a/server/startup/migrations/v119.js b/server/startup/migrations/v119.js index 5a5630b0637..c66c2d88ccc 100644 --- a/server/startup/migrations/v119.js +++ b/server/startup/migrations/v119.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 119, diff --git a/server/startup/migrations/v120.js b/server/startup/migrations/v120.js index b19ffe8b0ed..37944478374 100644 --- a/server/startup/migrations/v120.js +++ b/server/startup/migrations/v120.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 120, diff --git a/server/startup/migrations/v121.js b/server/startup/migrations/v121.js index bfad9feed3c..05efa66a12c 100644 --- a/server/startup/migrations/v121.js +++ b/server/startup/migrations/v121.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions } from '../../../app/models'; Migrations.add({ version: 121, diff --git a/server/startup/migrations/v122.js b/server/startup/migrations/v122.js index 5a4df3b96ea..108f8dfca02 100644 --- a/server/startup/migrations/v122.js +++ b/server/startup/migrations/v122.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions } from '../../../app/models'; Migrations.add({ version: 122, diff --git a/server/startup/migrations/v123.js b/server/startup/migrations/v123.js index 37f6f412033..a33563eabfa 100644 --- a/server/startup/migrations/v123.js +++ b/server/startup/migrations/v123.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { Migrations } from '/app/migrations'; -import { Messages, Rooms, LivechatPageVisited } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Messages, Rooms, LivechatPageVisited } from '../../../app/models'; let pageVisitedCollection; let messageCollection; diff --git a/server/startup/migrations/v124.js b/server/startup/migrations/v124.js index 0798f861011..da249151a9f 100644 --- a/server/startup/migrations/v124.js +++ b/server/startup/migrations/v124.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 124, diff --git a/server/startup/migrations/v125.js b/server/startup/migrations/v125.js index ca3117be4f8..c9c010668f9 100644 --- a/server/startup/migrations/v125.js +++ b/server/startup/migrations/v125.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users } from '../../../app/models'; Migrations.add({ version: 125, diff --git a/server/startup/migrations/v126.js b/server/startup/migrations/v126.js index 5f5d8e0c020..e6129182912 100644 --- a/server/startup/migrations/v126.js +++ b/server/startup/migrations/v126.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 126, diff --git a/server/startup/migrations/v127.js b/server/startup/migrations/v127.js index dba725f4267..99b676b2c1f 100644 --- a/server/startup/migrations/v127.js +++ b/server/startup/migrations/v127.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Permissions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Permissions } from '../../../app/models'; Migrations.add({ version: 127, diff --git a/server/startup/migrations/v128.js b/server/startup/migrations/v128.js index 6f605130f90..b8ca7850255 100644 --- a/server/startup/migrations/v128.js +++ b/server/startup/migrations/v128.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 128, diff --git a/server/startup/migrations/v129.js b/server/startup/migrations/v129.js index 5f99c2a5652..5c140501565 100644 --- a/server/startup/migrations/v129.js +++ b/server/startup/migrations/v129.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions } from '../../../app/models'; Migrations.add({ version: 129, diff --git a/server/startup/migrations/v130.js b/server/startup/migrations/v130.js index 0a78f41011f..83226bf7355 100644 --- a/server/startup/migrations/v130.js +++ b/server/startup/migrations/v130.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import Future from 'fibers/future'; -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions, Users } from '../../../app/models'; Migrations.add({ version: 130, diff --git a/server/startup/migrations/v131.js b/server/startup/migrations/v131.js index 3e8513837ba..3cd2bcd3f5c 100644 --- a/server/startup/migrations/v131.js +++ b/server/startup/migrations/v131.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Users, Subscriptions, Rooms, Messages } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Users, Subscriptions, Rooms, Messages } from '../../../app/models'; Migrations.add({ version: 131, diff --git a/server/startup/migrations/v132.js b/server/startup/migrations/v132.js index 9b4aee7d52c..8fef82d4992 100644 --- a/server/startup/migrations/v132.js +++ b/server/startup/migrations/v132.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Rooms, Subscriptions } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Rooms, Subscriptions } from '../../../app/models'; Migrations.add({ version: 132, diff --git a/server/startup/migrations/v133.js b/server/startup/migrations/v133.js index a259583448d..8067befc979 100644 --- a/server/startup/migrations/v133.js +++ b/server/startup/migrations/v133.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Subscriptions, Users } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Subscriptions, Users } from '../../../app/models'; Migrations.add({ version: 133, diff --git a/server/startup/migrations/v134.js b/server/startup/migrations/v134.js index 368f9d52a83..11ae56f0f1d 100644 --- a/server/startup/migrations/v134.js +++ b/server/startup/migrations/v134.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 134, diff --git a/server/startup/migrations/v135.js b/server/startup/migrations/v135.js index 2e7478f71b1..ce2f3bdcb83 100644 --- a/server/startup/migrations/v135.js +++ b/server/startup/migrations/v135.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; const fixURLs = (text) => text.replace(/: \/\//g, '://'); diff --git a/server/startup/migrations/v136.js b/server/startup/migrations/v136.js index af6210822ec..ee416a460ef 100644 --- a/server/startup/migrations/v136.js +++ b/server/startup/migrations/v136.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Settings, Roles, Permissions } from '/app/models'; -import { settings } from '/app/settings'; +import { Migrations } from '../../../app/migrations'; +import { Settings, Roles, Permissions } from '../../../app/models'; +import { settings } from '../../../app/settings'; Migrations.add({ version: 136, diff --git a/server/startup/migrations/v137.js b/server/startup/migrations/v137.js index 2fbeaa9a8bf..02a9e0fbb3e 100644 --- a/server/startup/migrations/v137.js +++ b/server/startup/migrations/v137.js @@ -1,6 +1,6 @@ -import { Migrations } from '/app/migrations'; -import { Users, Settings } from '/app/models'; -import { settings } from '/app/settings'; +import { Migrations } from '../../../app/migrations'; +import { Users, Settings } from '../../../app/models'; +import { settings } from '../../../app/settings'; Migrations.add({ version: 137, diff --git a/server/startup/migrations/v138.js b/server/startup/migrations/v138.js index f5d731e0a4d..8fc8c6e68ae 100644 --- a/server/startup/migrations/v138.js +++ b/server/startup/migrations/v138.js @@ -1,5 +1,5 @@ -import { Migrations } from '/app/migrations'; -import { Settings } from '/app/models'; +import { Migrations } from '../../../app/migrations'; +import { Settings } from '../../../app/models'; Migrations.add({ version: 138, diff --git a/server/startup/migrations/xrun.js b/server/startup/migrations/xrun.js index d12025d6fe7..609b2caaa2c 100644 --- a/server/startup/migrations/xrun.js +++ b/server/startup/migrations/xrun.js @@ -1,5 +1,5 @@ import _ from 'underscore'; -import { Migrations } from '/app/migrations'; +import { Migrations } from '../../../app/migrations'; if (Migrations.getVersion() !== 0) { Migrations.migrateTo(process.env.MIGRATION_VERSION || 'latest'); diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js index e7f3e4fe4d2..040d7fa057e 100644 --- a/server/startup/serverRunning.js +++ b/server/startup/serverRunning.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { MongoInternals } from 'meteor/mongo'; -import { SystemLogger } from '/app/logger'; -import { settings } from '/app/settings'; -import { Info } from '/app/utils'; +import { SystemLogger } from '../../app/logger'; +import { settings } from '../../app/settings'; +import { Info } from '../../app/utils'; import fs from 'fs'; import path from 'path'; import semver from 'semver'; diff --git a/server/stream/messages.js b/server/stream/messages.js index 0889ad85aae..205ed8f978f 100644 --- a/server/stream/messages.js +++ b/server/stream/messages.js @@ -1,8 +1,8 @@ import { Meteor } from 'meteor/meteor'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { Subscriptions, Users, Messages } from '/app/models'; -import { msgStream } from '/app/lib'; +import { hasPermission } from '../../app/authorization'; +import { settings } from '../../app/settings'; +import { Subscriptions, Users, Messages } from '../../app/models'; +import { msgStream } from '../../app/lib'; const MY_MESSAGE = '__my_messages__'; diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js index d93c839969c..e449605c4c2 100644 --- a/server/stream/streamBroadcast.js +++ b/server/stream/streamBroadcast.js @@ -4,10 +4,10 @@ import { check } from 'meteor/check'; import _ from 'underscore'; import { DDP } from 'meteor/ddp'; import { DDPCommon } from 'meteor/ddp-common'; -import { Logger, LoggerManager } from '/app/logger'; -import { hasPermission } from '/app/authorization'; -import { settings } from '/app/settings'; -import { isDocker } from '/app/utils'; +import { Logger, LoggerManager } from '../../app/logger'; +import { hasPermission } from '../../app/authorization'; +import { settings } from '../../app/settings'; +import { isDocker } from '../../app/utils'; process.env.PORT = String(process.env.PORT).trim(); process.env.INSTANCE_IP = String(process.env.INSTANCE_IP).trim();