Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

SYM-1613 - Add ability to attach multiple attachements on client messages #87

Merged
symphony-elias merged 3 commits into from
Nov 27, 2020
Merged

SYM-1613 - Add ability to attach multiple attachements on client messages #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
681f765
feat: add ability to send multiple attachements inside send MessageCl…
JulienBlacas Jul 8, 2020
9e95b01
feat: expose sendMessageWithMultipleAttachments function inside SymBo…
JulienBlacas Jul 8, 2020
cf34870
added log about attaching to datafeed
vinnie777 Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/DatafeedEventsService/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class DatafeedEventsService extends EventEmitter {
this.retries = 0

if (this.id) {
console.log('Attached to existing datafeed')
this._read()
} else {
this._create()
Expand All @@ -96,6 +97,7 @@ class DatafeedEventsService extends EventEmitter {
_create() {
DatafeedClient.createDatafeed().then(
({ id }) => {
console.log('Created new datafeed')
this.id = id
this.emit('created', id)
this._read()
Expand Down
48 changes: 36 additions & 12 deletions lib/MessagesClient/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ MessagesClient.MESSAGEML_FORMAT = 'messageML'
MessagesClient.sendMessage = (conversationId, message, data, format, sessionToken) => {
if (format === MessagesClient.PRESENTATIONML_FORMAT) {
message = '<div data-format="PresentationML" data-version="2.0">' + message + '</div>'
return send(conversationId, message, data, undefined, undefined, undefined, sessionToken)
return send(conversationId, message, data, undefined, sessionToken)
} else if (format === MessagesClient.MESSAGEML_FORMAT) {
message = '<messageML>' + message + '</messageML>'
return send(conversationId, message, data, undefined, undefined, undefined, sessionToken)
return send(conversationId, message, data, undefined,sessionToken)
}
}

Expand All @@ -27,14 +27,32 @@ MessagesClient.sendMessageWithAttachment = (
fileName,
fileType,
fileContent,
format
format,
sessionToken
) => {
if (format === MessagesClient.PRESENTATIONML_FORMAT) {
message = '<div data-format="PresentationML" data-version="2.0">' + message + '</div>'
return send(conversationId, message, data, fileName, fileType, fileContent)
return send(conversationId, message, data, [{fileName, fileType, fileContent}], sessionToken)
} else if (format === MessagesClient.MESSAGEML_FORMAT) {
message = '<messageML>' + message + '</messageML>'
return send(conversationId, message, data, fileName, fileType, fileContent)
return send(conversationId, message, data, [{fileName, fileType, fileContent}], sessionToken)
}
};

MessagesClient.sendMessageWithMultipleAttachments = (
conversationId,
message,
data,
files,

@symphony-adnane symphony-adnane Jul 9, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this have any public documentation?
we should be clair on the format of the files array

format,
sessionToken
) => {
if (format === MessagesClient.PRESENTATIONML_FORMAT) {
message = '<div data-format="PresentationML" data-version="2.0">' + message + '</div>'
return send(conversationId, message, data, files, sessionToken)
} else if (format === MessagesClient.MESSAGEML_FORMAT) {
message = '<messageML>' + message + '</messageML>'
return send(conversationId, message, data, files, sessionToken)
}
}

Expand Down Expand Up @@ -73,19 +91,25 @@ MessagesClient.getMessage = messageId =>
agentRequest('get', `/agent/v1/message/${messageId}`, 'MessagesClient/getMessage')

/* Generic function to send/forward messages from MessagesClient interface */
function send (conversationId, message, data, fileName, fileType, fileContent, sessionToken) {
function send (conversationId, message, data, files, sessionToken) {

const form = new FormData()
form.append('message', message)
if (data) {
form.append('data', data)
}

if (fileName && fileType && fileContent) {
form.append('attachment', fileContent, {
filename: fileName,
contentType: fileType,
knownLength: fileContent.length
})
if(files) {
files.forEach(file => {
const { fileName, fileType, fileContent } = file;
if (fileName && fileType && fileContent) {
form.append('attachment', fileContent, {
filename: fileName,
contentType: fileType,
knownLength: fileContent.length
})
}
});
}
return agentRequest(
'post',
Expand Down
1 change: 1 addition & 0 deletions lib/SymBotClient/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ SymBotClient.stopFirehoseEventsService = FirehoseEventsService.stopService

SymBotClient.sendMessage = MessagesClient.sendMessage
SymBotClient.sendMessageWithAttachment = MessagesClient.sendMessageWithAttachment
SymBotClient.sendMessageWithMultipleAttachments = MessagesClient.sendMessageWithMultipleAttachments
SymBotClient.forwardMessage = MessagesClient.forwardMessage
SymBotClient.getAttachment = MessagesClient.getAttachment
SymBotClient.getMessage = MessagesClient.getMessage
Expand Down