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

build erros fixed

Browse Source
pull/9218/head
jorgeluisrezende 8 years ago
parent b9f4f3e0a6
commit 420ad5ef59
7 changed files with 473 additions and 1148 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1458
      package-lock.json
  2. 1
      package.json
  3. 14
      packages/rocketchat-file-upload/server/lib/FileUpload.js
  4. 68
      packages/rocketchat-file-upload/server/methods/sendFileMessage.js
  5. 62
      packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
  6. 16
      packages/rocketchat-katex/package-lock.json
  7. 2
      packages/rocketchat-ui-message/client/renderMessageBody.js

1458
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
Unescape View File

@ -128,6 +128,7 @@
"poplib": "^0.1.7",
"prom-client": "^10.2.2",
"semver": "^5.4.1",
"sharp": "^0.18.4",
"toastr": "^2.1.2",
"underscore": "^1.8.3",
"underscore.string": "^3.3.4",

14
packages/rocketchat-file-upload/server/lib/FileUpload.js
Unescape View File

@ -4,6 +4,7 @@ import fs from 'fs';
import stream from 'stream';
import mime from 'mime-type/with-db';
import Future from 'fibers/future';
import sharp from 'sharp';
Object.assign(FileUpload, {
handlers: {},
@ -77,7 +78,20 @@ Object.assign(FileUpload, {
}));
return future.wait();
},
resizeImagePreview(file, callback) {
const image = FileUpload.getStore('Uploads')._store.getReadStream(file._id, file);
const transformer = sharp().resize(50, 50).max().toBuffer(function(err, out) {
if (err) { throw err; }
callback(out.toString('base64'));
});
if (/^image\/.+/.test(file.type)) {
image.pipe(transformer);
} else {
callback();
}
},
uploadsTransformWrite(readStream, writeStream, fileId, file) {
if (RocketChatFile.enabled === false || !/^image\/.+/.test(file.type)) {
return readStream.pipe(writeStream);

68
packages/rocketchat-file-upload/server/methods/sendFileMessage.js
Unescape View File

@ -32,42 +32,46 @@ Meteor.methods({
title_link_download: true
};
if (/^image\/.+/.test(file.type)) {
attachment.image_url = fileUrl;
attachment.image_type = file.type;
attachment.image_size = file.size;
if (file.identify && file.identify.size) {
attachment.image_dimensions = file.identify.size;
Meteor.wrapAsync(FileUpload.resizeImagePreview(file, Meteor.bindEnvironment(function(base64Preview) {
if (/^image\/.+/.test(file.type)) {
attachment.image_preview = base64Preview;
attachment.image_url = fileUrl;
attachment.image_type = file.type;
attachment.image_size = file.size;
if (file.identify && file.identify.size) {
attachment.image_dimensions = file.identify.size;
}
} else if (/^audio\/.+/.test(file.type)) {
attachment.audio_url = fileUrl;
attachment.audio_type = file.type;
attachment.audio_size = file.size;
} else if (/^video\/.+/.test(file.type)) {
attachment.video_url = fileUrl;
attachment.video_type = file.type;
attachment.video_size = file.size;
}
} else if (/^audio\/.+/.test(file.type)) {
attachment.audio_url = fileUrl;
attachment.audio_type = file.type;
attachment.audio_size = file.size;
} else if (/^video\/.+/.test(file.type)) {
attachment.video_url = fileUrl;
attachment.video_type = file.type;
attachment.video_size = file.size;
}
const user = Meteor.user();
let msg = Object.assign({
_id: Random.id(),
rid: roomId,
ts: new Date(),
msg: '',
file: {
_id: file._id,
name: file.name,
type: file.type
},
groupable: false,
attachments: [attachment]
}, msgData);
const user = Meteor.user();
let msg = Object.assign({
_id: Random.id(),
rid: roomId,
ts: new Date(),
msg: '',
file: {
_id: file._id,
name: file.name,
type: file.type
},
groupable: false,
attachments: [attachment]
}, msgData);
msg = Meteor.call('sendMessage', msg);
msg = Meteor.call('sendMessage', msg);
Meteor.defer(() => RocketChat.callbacks.run('afterFileUpload', { user, room, message: msg }));
Meteor.defer(() => RocketChat.callbacks.run('afterFileUpload', { user, room, message: msg }));
return msg;
return msg;
})));
}
});

62
packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json generated
Unescape View File

@ -2,9 +2,9 @@
"lockfileVersion": 1,
"dependencies": {
"ajv": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz",
"integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak="
"version": "5.5.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU="
},
"ansi-regex": {
"version": "2.1.1",
@ -353,14 +353,14 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
"grpc": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.2.tgz",
"integrity": "sha512-GH6xziNGjW8LAtqQ3HmYI7Tx8BIlr46iaMRXHfh46kkaOP6PNWUx47ULNTUlXSYR3P00d0Pl8uzodTLwPk805w==",
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/grpc/-/grpc-1.8.0.tgz",
"integrity": "sha512-AwVQiyMdNv09O4kwec3z52HwkPuo1i61Uk1oENWM9CDeLAUiixQLMpXDIJL31MmZdAuKnAYds/naFEXzprbgHg==",
"dependencies": {
"abbrev": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"ajv": {
"version": "4.11.8",
@ -485,9 +485,9 @@
}
},
"debug": {
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
},
"deep-extend": {
"version": "0.4.2",
@ -505,9 +505,9 @@
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
"detect-libc": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
"integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE="
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
},
"ecc-jsbn": {
"version": "0.1.1",
@ -567,9 +567,9 @@
}
},
"glob": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg="
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
},
"graceful-fs": {
"version": "4.1.11",
@ -617,9 +617,9 @@
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ini": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
@ -711,14 +711,12 @@
"node-pre-gyp": {
"version": "0.6.39",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
"integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
"dependencies": {
"nopt": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
}
}
"integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="
},
"nopt": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
},
"npmlog": {
"version": "4.1.2",
@ -1239,9 +1237,9 @@
"integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="
},
"retry-request": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.2.0.tgz",
"integrity": "sha512-QwzQvJJphYfwOfsLQACcTLx0d2kuHM5LB3CEPJG7urUbHYTbSf9jWW5XJtMFDNd1oylGOe77EccuLZzsPl+UnQ=="
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz",
"integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw=="
},
"rgb-hex": {
"version": "1.0.0",

16
packages/rocketchat-katex/package-lock.json generated
Unescape View File

@ -5,15 +5,19 @@
"requires": true,
"dependencies": {
"katex": {
"version": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz",
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz",
"integrity": "sha1-BrtSmO+tBeHnIoA1uo4VkfMGG48=",
"requires": {
"match-at": "https://registry.npmjs.org/match-at/-/match-at-0.1.0.tgz"
"match-at": "0.1.1"
},
"dependencies": {
"match-at": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.1.tgz",
"integrity": "sha512-h4Yd392z9mST+dzc+yjuybOGFNOZjmXIPKWjxBd1Bb23r4SmDOsk2NYCU2BMUBGbSpZqwVsZYNq26QS3xfaT3Q=="
}
}
},
"match-at": {
"version": "https://registry.npmjs.org/match-at/-/match-at-0.1.0.tgz",
"integrity": "sha1-9WHncJ/5oQW4XMYsa47nwVvyTzE="
}
}
}

2
packages/rocketchat-ui-message/client/renderMessageBody.js
Unescape View File

@ -9,7 +9,7 @@ renderMessageBody = function(msg) {
}
const message = RocketChat.callbacks.run('renderMessage', msg);
console.log(msg);
if (message.tokens && message.tokens.length > 0) {
for (const {token, text} of message.tokens) {
message.html = message.html.replace(token, () => text); // Uses lambda so doesn't need to escape $

Write Preview
Loading…
Cancel
Save