Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Matrix Node): Allow setting filename if the binary data has none #6536

Merged
merged 2 commits into from
Jun 26, 2023
Merged

feat(Matrix Node): Allow setting filename if the binary data has none #6536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7d6a1
Add support setting the filename
Joffcom Jun 23, 2023
ca19a89
Removed import that appeared
Joffcom Jun 23, 2023
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
10 changes: 8 additions & 2 deletions packages/nodes-base/nodes/Matrix/GenericFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export async function handleMatrixCall(
const roomId = this.getNodeParameter('roomId', index) as string;
const mediaType = this.getNodeParameter('mediaType', index) as string;
const binaryPropertyName = this.getNodeParameter('binaryPropertyName', index);
const additionalFields = this.getNodeParameter('additionalFields', index);

let body;
const qs: IDataObject = {};
Expand All @@ -197,7 +198,12 @@ export async function handleMatrixCall(
const { fileName, mimeType } = this.helpers.assertBinaryData(index, binaryPropertyName);
body = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);

qs.filename = fileName;
if (additionalFields.fileName) {
qs.filename = additionalFields.fileName as string;
} else {
qs.filename = fileName;
}

headers['Content-Type'] = mimeType;
headers.accept = 'application/json,text/*;q=0.99';

Expand All @@ -216,7 +222,7 @@ export async function handleMatrixCall(

body = {
msgtype: `m.${mediaType}`,
body: fileName,
body: qs.filename,
url: uploadRequestResult.content_uri,
};
const messageId = uuid();
Expand Down
24 changes: 23 additions & 1 deletion packages/nodes-base/nodes/Matrix/MediaDescription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,30 @@ export const mediaFields: INodeProperties[] = [
description: 'Image media type',
},
],
description: 'Name of the uploaded file',
description: 'Type of file being uploaded',
placeholder: 'mxc://matrix.org/uploaded-media-uri',
required: true,
},
{
displayName: 'Additional Fields',
name: 'additionalFields',
type: 'collection',
placeholder: 'Add Field',
default: {},
displayOptions: {
show: {
resource: ['media'],
operation: ['upload'],
},
},
options: [
{
displayName: 'File Name',
name: 'fileName',
type: 'string',
default: '',
description: 'Name of the file being uploaded',
},
],
},
];