* dependencies update

* dependencies update

* dependencies update

* fiz indentation

* slack-client => @slack/client

* dependencies update
pull/10561/head^2
Gabriel Engel 7 years ago committed by Rodrigo Nascimento
parent b80fb8443f
commit a8fe146c8d
  1. 3296
      package-lock.json
  2. 22
      package.json
  3. 10
      packages/rocketchat-livechat/.app/package.json
  4. 2
      packages/rocketchat-slackbridge/server/slackbridge.js
  5. 16
      packages/rocketchat-ui-message/client/popup/messagePopupConfig.js

3296
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -88,22 +88,22 @@
},
"devDependencies": {
"@octokit/rest": "^15.2.6",
"autoprefixer": "^8.0.0",
"autoprefixer": "^8.3.0",
"babel-mocha-es6-compiler": "^0.1.0",
"babel-plugin-array-includes": "^2.0.3",
"chimp": "^0.51.1",
"conventional-changelog-cli": "^1.3.14",
"eslint": "^4.18.1",
"mocha": "^5.0.1",
"mock-require": "^3.0.1",
"postcss-custom-properties": "^6.2.0",
"conventional-changelog-cli": "^1.3.22",
"eslint": "^4.19.1",
"mocha": "^5.1.1",
"mock-require": "^3.0.2",
"postcss-custom-properties": "^6.3.1",
"postcss-import": "^11.1.0",
"postcss-media-minmax": "^3.0.0",
"postcss-nested": "^3.0.0",
"postcss-selector-not": "^3.0.1",
"progress": "^2.0.0",
"proxyquire": "^1.8.0",
"simple-git": "^1.91.0",
"simple-git": "^1.92.0",
"stylelint": "^8.4.0",
"stylelint-order": "^0.8.1",
"supertest": "^3.0.0"
@ -112,14 +112,15 @@
"@babel/runtime": "^7.0.0-beta.44",
"@google-cloud/language": "^1.1.0",
"@google-cloud/storage": "^1.6.0",
"@google-cloud/vision": "^0.15.2",
"@google-cloud/vision": "^0.19.0",
"@slack/client": "^4.1.0",
"adm-zip": "^0.4.7",
"archiver": "^2.1.1",
"atlassian-crowd": "^0.5.0",
"autolinker": "^1.6.2",
"aws-sdk": "^2.199.0",
"bad-words": "^1.6.1",
"bcrypt": "^1.0.3",
"bcrypt": "^2.0.1",
"bson": "^1.0.4",
"bugsnag": "^2.1.3",
"bunyan": "^1.8.12",
@ -164,8 +165,7 @@
"querystring": "^0.2.0",
"redis": "^2.8.0",
"semver": "^5.5.0",
"sharp": "^0.19.0",
"slack-client": "^2.0.6",
"sharp": "^0.20.1",
"speakeasy": "^2.0.0",
"tar-stream": "^1.5.5",
"toastr": "^2.1.4",

@ -20,14 +20,14 @@
"email": "support@rocket.chat"
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.40",
"@babel/runtime": "^7.0.0-beta.44",
"autolinker": "^1.6.2",
"bcrypt": "^1.0.3",
"core-js": "^2.5.3",
"bcrypt": "^2.0.1",
"core-js": "^2.5.5",
"jquery": "^3.3.1",
"moment": "^2.20.1",
"moment": "^2.22.1",
"toastr": "^2.1.4",
"underscore": "^1.8.3",
"underscore": "^1.9.0",
"underscore.string": "^3.3.4"
}
}

@ -9,7 +9,7 @@ class SlackBridge {
constructor() {
this.util = util;
this.slackClient = require('slack-client');
this.slackClient = require('@slack/client');
this.apiToken = RocketChat.settings.get('SlackBridge_APIToken');
this.aliasFormat = RocketChat.settings.get('SlackBridge_AliasFormat');
this.excludeBotnames = RocketChat.settings.get('SlackBridge_Botnames');

@ -163,15 +163,13 @@ Template.messagePopupConfig.helpers({
const user = Meteor.user();
if (!RocketChat.authz.hasAllPermission('view-outside-room')) {
const usernames = RocketChat.models.Subscriptions.find({$or :[{'name': exp}, { fname: exp}]}).fetch().map(({name}) =>name);
items.push(...
RocketChat.models.Users.find({username:{$in:usernames}}, {fields:{
username: 1,
name: 1,
status: 1
}}, {
limit: 5 - messageUsers.length
}).fetch().map(({username, name, status}) => ({ _id: username, username, name, status, sort: 1 }))
);
items.push(...RocketChat.models.Users.find({username:{$in:usernames}}, {fields:{
username: 1,
name: 1,
status: 1
}}, {
limit: 5 - messageUsers.length
}).fetch().map(({username, name, status}) => ({ _id: username, username, name, status, sort: 1 })));
} else {
items.push(...Meteor.users.find({
$and: [

Loading…
Cancel
Save