Skip to content

Commit 4abcd23

Browse files
shadoow051shadoow051
committed
...
1 parent dc1de21 commit 4abcd23

File tree

2 files changed

+109
-47
lines changed

2 files changed

+109
-47
lines changed

‎bot/actions/send_components_v2.js‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,39 @@ module.exports = {
5959
//≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
6060

6161
subtitle(data, presets) {
62-
return `test`;
62+
if (data.actionDescription) {
63+
return `<span style="color: ${
64+
data.actionDescriptionColor || "#ffffff"
65+
};">${data.actionDescription}</span>`;
66+
}
67+
let targetText = presets.getSendReplyTargetText(data.channel, data.varName);
68+
if (data.dontSend) {
69+
targetText = `Don't Send`;
70+
} else if (data.editMessage !== "0") {
71+
switch (data.editMessage) {
72+
case "intUpdate":
73+
targetText = "Interaction Update";
74+
break;
75+
case "deferUpdate":
76+
targetText = "Defer Update";
77+
break;
78+
case "replyUpdate":
79+
targetText = "Reply Update";
80+
break;
81+
default:
82+
targetText = `Edit ${presets.getVariableText(
83+
data.editMessage,
84+
data.editMessageVarName
85+
)}`;
86+
}
87+
}
88+
const messageText =
89+
data.components.length === 0
90+
? "Nothing (might cause error)"
91+
: `${data.components.length} ${
92+
data.components.length === 1 ? "Component" : "Components"
93+
}`;
94+
return `${targetText} - ${messageText}`;
6395
},
6496

6597
//≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
@@ -105,6 +137,8 @@ module.exports = {
105137
"allowMentionEveryone",
106138
"allowMentionCommandUser",
107139
"suppressNotifications",
140+
"actionDescription",
141+
"actionDescriptionColor",
108142
"editMessage",
109143
"editMessageVarName",
110144
"storage",
@@ -988,6 +1022,17 @@ module.exports = {
9881022
<br>
9891023
<hr class="subtlebar">
9901024
<br>
1025+
<div style="float: left; width: 79%;">
1026+
<span class="dbminputlabel">Action Description</span>
1027+
<input type="text" class="round" id="actionDescription" placeholder="Leave blank for default...">
1028+
</div>
1029+
<div style="float: right; width: 19%;">
1030+
<span class="dbminputlabel">Color</span>
1031+
<input type="color" value="#ffffff" class="round" id="actionDescriptionColor">
1032+
</div>
1033+
<br><br><br>
1034+
<hr class="subtlebar">
1035+
<br>
9911036
<retrieve-from-variable allowNone dropdownLabel="Message/Options to Edit" selectId="editMessage" variableInputId="editMessageVarName" variableContainerId="editMessageVarNameContainer">
9921037
<option value="intUpdate">Interaction Update</option>
9931038
<option value="deferUpdate">Defer Update</option>

‎bot/actions/send_message.js‎

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,58 @@ module.exports = {
2424
//≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
2525

2626
subtitle(data, presets) {
27-
let defaultText = "";
28-
if (data.message) {
29-
defaultText = `"${data.message.replace(/[\n\r]+/, " ↲ ")}"`;
30-
} else if (data.embeds?.length > 0) {
31-
defaultText = `${data.embeds.length} Embeds`;
32-
} else if (data.attachments?.length > 0) {
33-
defaultText = `${data.attachments.length} Attachments`;
34-
} else if (data.buttons?.length > 0 || data.selectMenus?.length > 0) {
35-
defaultText = `${data.buttons.length} Buttons and ${data.selectMenus.length} Select Menus`;
36-
} else if (data.editMessage && data.editMessage !== "0") {
37-
defaultText = `Message Options - ${presets.getVariableText(
38-
data.editMessage,
39-
data.editMessageVarName
40-
)}`;
41-
} else {
42-
defaultText = `Nothing (might cause error)`;
27+
if (data.actionDescription) {
28+
return `<span style="color: ${
29+
data.actionDescriptionColor || "#ffffff"
30+
};">${data.actionDescription}</span>`;
4331
}
44-
if (data.dontReply) {
45-
defaultText = `Store Data: ${defaultText}`;
46-
} else {
47-
defaultText = `${presets.getSendReplyTargetText(
48-
data.channel,
49-
data.varName
50-
)}: ${defaultText}`;
32+
let targetText = presets.getSendReplyTargetText(data.channel, data.varName);
33+
if (data.dontSend) {
34+
targetText = `Don't Send`;
35+
} else if (data.editMessage !== "0") {
36+
switch (data.editMessage) {
37+
case "intUpdate":
38+
targetText = "Interaction Update";
39+
break;
40+
case "deferUpdate":
41+
targetText = "Defer Update";
42+
break;
43+
case "replyUpdate":
44+
targetText = "Reply Update";
45+
break;
46+
default:
47+
targetText = `Edit ${presets.getVariableText(
48+
data.editMessage,
49+
data.editMessageVarName
50+
)}`;
51+
}
5152
}
52-
const userDesc = data.actionDescription?.toString().trim();
53-
if (userDesc) {
54-
const color = data.actionDescriptionColor || "#ffffff";
55-
return `<span style="color: ${color};">${userDesc}</span>`;
53+
let messageText;
54+
if (data.message) messageText = data.message;
55+
else if (!data.message) {
56+
if (data.embeds.length) {
57+
messageText = `${data.embeds.length} ${
58+
data.embeds.length === 1 ? "Embed" : "Embeds"
59+
}`;
60+
} else if (data.pollAnswers.length) {
61+
messageText = `Poll: ${data.pollQuestion}`;
62+
} else if (data.buttons.length) {
63+
messageText = `${data.buttons.length} ${
64+
data.buttons.length === 1 ? "Button" : "Buttons"
65+
}`;
66+
} else if (data.selectMenus.length) {
67+
messageText = `${data.selectMenus.length} ${
68+
data.selectMenus.length === 1 ? "Select Menu" : "Select Menus"
69+
}`;
70+
} else if (data.attachments.length) {
71+
messageText = `${data.attachments.length} ${
72+
data.attachments.length === 1 ? "Attachment" : "Attachments"
73+
}`;
74+
} else {
75+
messageText = "Nothing (might cause error)";
76+
}
5677
}
57-
return defaultText;
78+
return `${targetText} - ${messageText}`;
5879
},
5980

6081
//≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
@@ -703,24 +724,20 @@ module.exports = {
703724
<dbm-checkbox id="suppressNotifications" label="Suppress Notifications"></dbm-checkbox>
704725
</div>
705726
706-
<br>
707-
<hr class="subtlebar" style="margin-top: 4px; margin-bottom: 4px; width: 100%;">
708-
709-
<table style="width:100%;">
710-
<tr>
711-
<td>
712-
<span class="dbminputlabel">Action Description</span><br>
713-
<input type="text" class="round" id="actionDescription" placeholder="Leave blank for default...">
714-
</td>
715-
<td style="padding:0px 0px 0px 10px; width:55px;">
716-
<div style="float:left; padding:0px 0px 0px 7px; margin-top:-5px"></div><br>
717-
<input type="color" value="#ffffff" class="round" id="actionDescriptionColor">
718-
</td>
719-
</tr>
720-
</table>
721-
722-
<hr class="subtlebar" style="margin-top: 4px; margin-bottom: 4px; width: 100%;">
723-
<br>
727+
<br>
728+
<hr class="subtlebar">
729+
<br>
730+
<div style="float: left; width: 79%;">
731+
<span class="dbminputlabel">Action Description</span>
732+
<input type="text" class="round" id="actionDescription" placeholder="Leave blank for default...">
733+
</div>
734+
<div style="float: right; width: 19%;">
735+
<span class="dbminputlabel">Color</span>
736+
<input type="color" value="#ffffff" class="round" id="actionDescriptionColor">
737+
</div>
738+
<br><br><br>
739+
<hr class="subtlebar">
740+
<br>
724741
725742
<div style="padding-bottom: 12px;">
726743
<retrieve-from-variable allowNone dropdownLabel="Message/Options to Edit" selectId="editMessage" variableInputId="editMessageVarName" variableContainerId="editMessageVarNameContainer">

0 commit comments

Comments
 (0)