github-mirror/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-05-12 16:10:30 +02:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge e800bc63b9 into 0ce820de73

Browse Source
This commit is contained in:
Mees Muller 2026-05-12 15:47:13 +03:00 committed by GitHub
commit 5819629b22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/nodes-base/nodes/Slack/Slack.node.ts
View File

@ -13,7 +13,7 @@ export class Slack extends VersionedNodeType {
group: ['output'],
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
description: 'Consume Slack API',
defaultVersion: 2.4,
defaultVersion: 2.5,
};
const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@ -23,6 +23,7 @@ export class Slack extends VersionedNodeType {
2.2: new SlackV2(baseDescription),
2.3: new SlackV2(baseDescription),
2.4: new SlackV2(baseDescription),
2.5: new SlackV2(baseDescription),
};
super(nodeVersions, baseDescription);

21
packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
View File

@ -58,7 +58,7 @@ export class SlackV2 implements INodeType {
constructor(baseDescription: INodeTypeBaseDescription) {
this.description = {
...baseDescription,
version: [2, 2.1, 2.2, 2.3, 2.4],
version: [2, 2.1, 2.2, 2.3, 2.4, 2.5],
defaults: {
name: 'Slack',
},
@ -380,12 +380,19 @@ export class SlackV2 implements INodeType {
const instanceId = this.getInstanceId();
if (resource === 'message' && operation === SEND_AND_WAIT_OPERATION) {
await slackApiRequest.call(
this,
'POST',
'/chat.postMessage',
createSendAndWaitMessageBody(this),
);
try {
await slackApiRequest.call(
this,
'POST',
'/chat.postMessage',
createSendAndWaitMessageBody(this),
);
} catch (error) {
if (this.continueOnFail()) {
return [[{ json: { error: (error as JsonObject).message } }]];
}
throw error;
}
const waitTill = configureWaitTillDate(this);