n8n-nodes-discord-dnd 0.1.56 → 0.1.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,15 +19,17 @@ class DiscordEventHandler {
|
|
|
19
19
|
if (!memberOrUser)
|
|
20
20
|
return null;
|
|
21
21
|
const guild = guildId ? this.client.guilds.cache.get(guildId) : null;
|
|
22
|
-
const member = guild
|
|
22
|
+
const member = guild
|
|
23
|
+
? await guild.members.fetch(memberOrUser.id).catch(() => null)
|
|
24
|
+
: null;
|
|
23
25
|
return {
|
|
24
26
|
...memberOrUser,
|
|
25
|
-
roles: (member === null || member === void 0 ? void 0 : member.roles.cache.map(role => ({
|
|
27
|
+
roles: (member === null || member === void 0 ? void 0 : member.roles.cache.map((role) => ({
|
|
26
28
|
id: role.id,
|
|
27
29
|
name: role.name,
|
|
28
30
|
color: role.color,
|
|
29
|
-
position: role.position
|
|
30
|
-
}))) || []
|
|
31
|
+
position: role.position,
|
|
32
|
+
}))) || [],
|
|
31
33
|
};
|
|
32
34
|
};
|
|
33
35
|
switch (event) {
|
|
@@ -37,6 +39,13 @@ class DiscordEventHandler {
|
|
|
37
39
|
const message = args[0];
|
|
38
40
|
const messageData = (0, MessageTransformer_1.messageToJson)(message);
|
|
39
41
|
data.message = messageData;
|
|
42
|
+
// Use the guild ID from the message when enriching the author
|
|
43
|
+
if (message.author && message.guildId) {
|
|
44
|
+
data.user = await enrichMember(message.author, message.guildId);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
data.user = message.author;
|
|
48
|
+
}
|
|
40
49
|
if (message.reference && ((_a = messageData.mentions) === null || _a === void 0 ? void 0 : _a.repliedMessage)) {
|
|
41
50
|
const referencedContent = await (0, MessageTransformer_1.fetchReferencedMessage)(message);
|
|
42
51
|
if (referencedContent) {
|
|
@@ -52,8 +61,41 @@ class DiscordEventHandler {
|
|
|
52
61
|
break;
|
|
53
62
|
default:
|
|
54
63
|
data.eventData = args;
|
|
64
|
+
// Try to extract user/member and guild info from the first argument
|
|
65
|
+
const firstArg = args[0];
|
|
66
|
+
if (firstArg) {
|
|
67
|
+
if (firstArg.author && firstArg.guildId) {
|
|
68
|
+
// Message-like object
|
|
69
|
+
data.user = await enrichMember(firstArg.author, firstArg.guildId);
|
|
70
|
+
}
|
|
71
|
+
else if (firstArg.user && firstArg.guild) {
|
|
72
|
+
// Member-like object
|
|
73
|
+
data.user = await enrichMember(firstArg.user, firstArg.guild.id);
|
|
74
|
+
}
|
|
75
|
+
else if (firstArg.id) {
|
|
76
|
+
// User-like object, try to find in guilds
|
|
77
|
+
const guilds = this.client.guilds.cache;
|
|
78
|
+
let enrichedUser = null;
|
|
79
|
+
// Try to find user in any guild the bot is in
|
|
80
|
+
for (const [, guild] of guilds) {
|
|
81
|
+
try {
|
|
82
|
+
const member = await guild.members.fetch(firstArg.id);
|
|
83
|
+
if (member) {
|
|
84
|
+
enrichedUser = await enrichMember(firstArg, guild.id);
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
// Ignore errors, just try next guild
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
data.user = enrichedUser || firstArg;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
55
95
|
}
|
|
56
|
-
this.triggerInstance.emit([
|
|
96
|
+
this.triggerInstance.emit([
|
|
97
|
+
this.triggerInstance.helpers.returnJsonArray([data]),
|
|
98
|
+
]);
|
|
57
99
|
});
|
|
58
100
|
}
|
|
59
101
|
setupStatusLogging() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordEventHandler.js","sourceRoot":"","sources":["../../src/handlers/DiscordEventHandler.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"DiscordEventHandler.js","sourceRoot":"","sources":["../../src/handlers/DiscordEventHandler.ts"],"names":[],"mappings":"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"}
|