@futdevpro/nts-dynamo 1.11.17 → 1.11.19
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.
- package/build/_modules/discord-assistant/_collections/dias.util.d.ts +10 -1
- package/build/_modules/discord-assistant/_collections/dias.util.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_collections/dias.util.js +45 -0
- package/build/_modules/discord-assistant/_collections/dias.util.js.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-io.control-service.d.ts +3 -2
- package/build/_modules/discord-assistant/_services/dias-io.control-service.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-io.control-service.js +1 -1
- package/build/_modules/discord-assistant/_services/dias-io.control-service.js.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-main.control-service.d.ts +0 -1
- package/build/_modules/discord-assistant/_services/dias-main.control-service.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-main.control-service.js +0 -15
- package/build/_modules/discord-assistant/_services/dias-main.control-service.js.map +1 -1
- package/build/_modules/discord-assistant/_services/dias.service-base.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_services/dias.service-base.js +1 -0
- package/build/_modules/discord-assistant/_services/dias.service-base.js.map +1 -1
- package/build/_modules/discord-assistant/index.d.ts +1 -0
- package/build/_modules/discord-assistant/index.d.ts.map +1 -1
- package/build/_modules/discord-assistant/index.js +1 -0
- package/build/_modules/discord-assistant/index.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-commands.control-service.d.ts +2 -2
- package/build/_modules/discord-bot/_services/dibo-commands.control-service.d.ts.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-commands.control-service.js +4 -4
- package/build/_modules/discord-bot/_services/dibo-commands.control-service.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-io.control-service.d.ts +7 -6
- package/build/_modules/discord-bot/_services/dibo-io.control-service.d.ts.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-io.control-service.js +24 -15
- package/build/_modules/discord-bot/_services/dibo-io.control-service.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.d.ts.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js +2 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.d.ts +1 -1
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.js +6 -4
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.js.map +1 -1
- package/package.json +1 -1
- package/src/_modules/discord-assistant/_collections/dias.util.ts +79 -1
- package/src/_modules/discord-assistant/_services/dias-io.control-service.ts +4 -3
- package/src/_modules/discord-assistant/_services/dias-main.control-service.ts +2 -2
- package/src/_modules/discord-assistant/_services/dias.service-base.ts +2 -0
- package/src/_modules/discord-assistant/index.ts +1 -0
- package/src/_modules/discord-bot/_services/dibo-commands.control-service.ts +3 -3
- package/src/_modules/discord-bot/_services/dibo-io.control-service.ts +37 -21
- package/src/_modules/discord-bot/_services/dibo-main.control-service.ts +2 -1
- package/src/_modules/open-ai/_services/oai-llm-chat.service-base.ts +7 -5
|
@@ -1,6 +1,15 @@
|
|
|
1
|
-
import { Message } from 'discord.js';
|
|
1
|
+
import { Message, TextChannel } from 'discord.js';
|
|
2
2
|
import { DyNTS_OAI_GPT_Message } from '../../open-ai/_models/interfaces/oai-gpt-message.interface';
|
|
3
3
|
export declare class DyNTS_DiAs_Util {
|
|
4
4
|
static convertDiscordMessagesToOAIConversation(messages: Message[], botClientId: string, botDisplayName: string): DyNTS_OAI_GPT_Message[];
|
|
5
|
+
static gatherMessagesAsOAIConversation(message: Message, botClientId: string, botDisplayName: string, issuer: string, skipFlags?: string[]): Promise<DyNTS_OAI_GPT_Message[]>;
|
|
6
|
+
static gatherMessagesForMessage(message: Message, botClientId: string, issuer: string, skipFlags?: string[]): Promise<Message[]>;
|
|
7
|
+
static gatherMessages(set: {
|
|
8
|
+
channel: TextChannel;
|
|
9
|
+
userId: string;
|
|
10
|
+
botClientId: string;
|
|
11
|
+
skipFlags?: string[];
|
|
12
|
+
issuer: string;
|
|
13
|
+
}): Promise<Message[]>;
|
|
5
14
|
}
|
|
6
15
|
//# sourceMappingURL=dias.util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias.util.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_collections/dias.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"dias.util.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_collections/dias.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAMnG,qBAAa,eAAe;IAE1B,MAAM,CAAC,uCAAuC,CAC5C,QAAQ,EAAE,OAAO,EAAE,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,qBAAqB,EAAE;WA+Bb,+BAA+B,CAC1C,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,qBAAqB,EAAE,CAAC;WAUtB,wBAAwB,CACnC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,OAAO,EAAE,CAAC;WAaR,cAAc,CACzB,GAAG,EAAE;QAEH,OAAO,EAAE,WAAW,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,OAAO,EAAE,CAAC;CAiCtB"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DyNTS_DiAs_Util = void 0;
|
|
4
4
|
const dias_global_settings_const_1 = require("./dias-global-settings.const");
|
|
5
5
|
const open_ai_1 = require("../../open-ai");
|
|
6
|
+
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
7
|
class DyNTS_DiAs_Util {
|
|
7
8
|
static convertDiscordMessagesToOAIConversation(messages, botClientId, botDisplayName) {
|
|
8
9
|
return messages.map(message => {
|
|
@@ -31,6 +32,50 @@ class DyNTS_DiAs_Util {
|
|
|
31
32
|
}
|
|
32
33
|
});
|
|
33
34
|
}
|
|
35
|
+
static async gatherMessagesAsOAIConversation(message, botClientId, botDisplayName, issuer, skipFlags) {
|
|
36
|
+
const messages = await this.gatherMessagesForMessage(message, botClientId, issuer, skipFlags);
|
|
37
|
+
return DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation(messages, botClientId, botDisplayName);
|
|
38
|
+
}
|
|
39
|
+
static async gatherMessagesForMessage(message, botClientId, issuer, skipFlags) {
|
|
40
|
+
if (!message.channel.isTextBased()) {
|
|
41
|
+
throw new Error('Message channel is not a text channel!');
|
|
42
|
+
}
|
|
43
|
+
return this.gatherMessages({
|
|
44
|
+
channel: message.channel,
|
|
45
|
+
userId: message.author.id,
|
|
46
|
+
botClientId: botClientId,
|
|
47
|
+
skipFlags: skipFlags,
|
|
48
|
+
issuer: issuer,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
static async gatherMessages(set) {
|
|
52
|
+
try {
|
|
53
|
+
if (!set.channel.isTextBased()) {
|
|
54
|
+
throw new Error('Message channel is not a text channel!');
|
|
55
|
+
}
|
|
56
|
+
const messages = await set.channel.messages.fetch({
|
|
57
|
+
limit: 100,
|
|
58
|
+
}).then(messages => {
|
|
59
|
+
if (set.skipFlags) {
|
|
60
|
+
messages = messages.filter(msg => !set.skipFlags.some(flag => msg.content.includes(flag)));
|
|
61
|
+
}
|
|
62
|
+
return messages.map(msg => msg);
|
|
63
|
+
});
|
|
64
|
+
if (messages.some(msg => ![set.botClientId, set.userId].includes(msg.author.id))) {
|
|
65
|
+
messages.forEach(msg => {
|
|
66
|
+
msg.content = `**${msg.author.displayName}** ${msg.content}`;
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
return messages;
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
73
|
+
errorCode: 'DIA-DU-GM0',
|
|
74
|
+
error: error,
|
|
75
|
+
//...this.getDefaultErrorSettings('gatherMessages', error, set.issuer),
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
}
|
|
34
79
|
}
|
|
35
80
|
exports.DyNTS_DiAs_Util = DyNTS_DiAs_Util;
|
|
36
81
|
//# sourceMappingURL=dias.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias.util.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_collections/dias.util.ts"],"names":[],"mappings":";;;AAEA,6EAA0E;AAC1E,2CAA2D;
|
|
1
|
+
{"version":3,"file":"dias.util.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_collections/dias.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,9 @@ import { DyNTS_DiBo_IO_ControlService } from '../../discord-bot';
|
|
|
3
3
|
import { DyNTS_DiAs_Main_ControlService } from './dias-main.control-service';
|
|
4
4
|
import { DyNTS_OAI_LLMChat_ServiceBase } from '../../open-ai/_services/oai-llm-chat.service-base';
|
|
5
5
|
export declare abstract class DyNTS_DiAs_IO_ControlService extends DyNTS_DiBo_IO_ControlService {
|
|
6
|
-
protected abstract
|
|
6
|
+
protected abstract getMainDiscordBotControlService(): DyNTS_DiAs_Main_ControlService;
|
|
7
|
+
protected abstract mainDiscordBot_CS: DyNTS_DiAs_Main_ControlService;
|
|
7
8
|
get llmChat_CS(): DyNTS_OAI_LLMChat_ServiceBase;
|
|
8
|
-
handleMessage(message: Message, issuer: string): Promise<
|
|
9
|
+
handleMessage(message: Message, issuer: string): Promise<Message>;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=dias-io.control-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-io.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-io.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6D,OAAO,EAAe,MAAM,YAAY,CAAA;AAI5G,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAE5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAA;AAIjG,8BAAsB,4BAA6B,SAAQ,4BAA4B;
|
|
1
|
+
{"version":3,"file":"dias-io.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-io.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6D,OAAO,EAAe,MAAM,YAAY,CAAA;AAI5G,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAE5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAA;AAIjG,8BAAsB,4BAA6B,SAAQ,4BAA4B;uBAOzD,+BAA+B,IAAI,8BAA8B;IAC7F,mBAA4B,iBAAiB,EAAE,8BAA8B,CAAC;IAI9E,IAAI,UAAU,IAAI,6BAA6B,CAE9C;IAEc,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAqCjF"}
|
|
@@ -23,7 +23,7 @@ class DyNTS_DiAs_IO_ControlService extends discord_bot_1.DyNTS_DiBo_IO_ControlSe
|
|
|
23
23
|
systemPrompt: this.mainDiscordBot_CS.defaultSystemPrompt,
|
|
24
24
|
},
|
|
25
25
|
});
|
|
26
|
-
await message.reply(gptResult);
|
|
26
|
+
return await message.reply(gptResult);
|
|
27
27
|
}
|
|
28
28
|
catch (error) {
|
|
29
29
|
fsm_dynamo_1.DyFM_Error.logSimple('❌❌ Error handleNewMessage:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-io.control-service.ts"],"names":[],"mappings":";;;AAEA,sDAAwE;AACxE,uFAAmF;AACnF,mDAAgE;AAEhE,0GAAsG;AAGtG,yDAA2D;AAE3D,MAAsB,4BAA6B,SAAQ,0CAA4B;
|
|
1
|
+
{"version":3,"file":"dias-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-io.control-service.ts"],"names":[],"mappings":";;;AAEA,sDAAwE;AACxE,uFAAmF;AACnF,mDAAgE;AAEhE,0GAAsG;AAGtG,yDAA2D;AAE3D,MAAsB,4BAA6B,SAAQ,0CAA4B;IASrF;gDAC4C;IAE5C,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;IAC3C,CAAC;IAEQ,KAAK,CAAC,aAAa,CAAC,OAAgB,EAAE,MAAc;QAC3D,IAAI,CAAC;YACH,MAAM,QAAQ,GAAc,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACjF,MAAM,WAAW,GACf,2BAAe,CAAC,uCAAuC,CACrD,QAAQ,EACR,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAClC,IAAI,CAAC,iBAAiB,CAAC,cAAc,CACtC,CAAC;YAEJ,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC;gBACzE,YAAY,EAAE,WAAW;gBACzB,MAAM,EAAE,MAAM;gBACd,QAAQ,EAAE;oBACR,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB;iBACzD;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uBAAU,CAAC,SAAS,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAE1D,IAAI,uDAA0B,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;gBAC/C,MAAM,OAAO,CAAC,KAAK,CACjB,6DAA6D;oBAC7D,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAChC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBACd,uBAAU,CAAC,SAAS,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;gBAC7E,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,eAAe,EAAE,KAAK,EAAE,MAAM,CAAC;gBAC/D,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,qBAAqB;aAC7E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;CACF;AArDD,oEAqDC"}
|
|
@@ -3,6 +3,5 @@ import { DyNTS_DiAs_IO_ControlService } from './dias-io.control-service';
|
|
|
3
3
|
export declare abstract class DyNTS_DiAs_Main_ControlService extends DyNTS_DiAs_ServiceBase {
|
|
4
4
|
protected abstract botIO_CS: DyNTS_DiAs_IO_ControlService;
|
|
5
5
|
protected abstract getBotIOControlService(): DyNTS_DiAs_IO_ControlService;
|
|
6
|
-
start(issuer: string): Promise<void>;
|
|
7
6
|
}
|
|
8
7
|
//# sourceMappingURL=dias-main.control-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-main.control-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAIzE,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAEjF,mBAA4B,QAAQ,EAAE,4BAA4B,CAAC;uBACvC,sBAAsB,IAAI,4BAA4B;
|
|
1
|
+
{"version":3,"file":"dias-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-main.control-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAIzE,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAEjF,mBAA4B,QAAQ,EAAE,4BAA4B,CAAC;uBACvC,sBAAsB,IAAI,4BAA4B;CAenF"}
|
|
@@ -1,23 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DyNTS_DiAs_Main_ControlService = void 0;
|
|
4
|
-
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
5
4
|
const dias_service_base_1 = require("./dias.service-base");
|
|
6
|
-
const __1 = require("../../..");
|
|
7
5
|
class DyNTS_DiAs_Main_ControlService extends dias_service_base_1.DyNTS_DiAs_ServiceBase {
|
|
8
|
-
async start(issuer) {
|
|
9
|
-
try {
|
|
10
|
-
await super.start(issuer);
|
|
11
|
-
this.botIO_CS = this.getBotIOControlService();
|
|
12
|
-
}
|
|
13
|
-
catch (error) {
|
|
14
|
-
fsm_dynamo_1.DyFM_Error.logSimple('❌❌ Error start:', error);
|
|
15
|
-
throw new fsm_dynamo_1.DyFM_Error({
|
|
16
|
-
...this.getDefaultErrorSettings('start', error, 'system-init'),
|
|
17
|
-
errorCode: `${__1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiAs-MCS-S0`,
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
6
|
}
|
|
22
7
|
exports.DyNTS_DiAs_Main_ControlService = DyNTS_DiAs_Main_ControlService;
|
|
23
8
|
//# sourceMappingURL=dias-main.control-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-main.control-service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"dias-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-main.control-service.ts"],"names":[],"mappings":";;;AAIA,2DAA6D;AAK7D,MAAsB,8BAA+B,SAAQ,0CAAsB;CAkBlF;AAlBD,wEAkBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,OAAO,EAAe,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AACvG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAOlG,8BAAsB,sBAAuB,SAAQ,8BAA8B;IAEjF,wBAAwB,IAAI,6BAA6B;IAGzD,QAAQ,CAAC,UAAU,EAAE,6BAA6B,CAAmC;IAErF,mBAAmB,EAAE,MAAM,CAAkD;IAE7E,SAAS;IAQH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"dias.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,OAAO,EAAe,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AACvG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAOlG,8BAAsB,sBAAuB,SAAQ,8BAA8B;IAEjF,wBAAwB,IAAI,6BAA6B;IAGzD,QAAQ,CAAC,UAAU,EAAE,6BAA6B,CAAmC;IAErF,mBAAmB,EAAE,MAAM,CAAkD;IAE7E,SAAS;IAQH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAsBhF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":";;;AAGA,qGAAuG;AACvG,iGAAkG;AAClG,2FAAwF;AACxF,uFAAoF;AAKpF,MAAsB,sBAAuB,SAAQ,0DAA8B;IAEjF,wBAAwB;QACtB,OAAO,IAAI,yDAA6B,EAAE,CAAC;IAC7C,CAAC;IACQ,UAAU,GAAkC,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAErF,mBAAmB,GAAW,uDAA0B,CAAC,mBAAmB,CAAC;IAE7E;QACE,KAAK,EAAE,CAAC;QAER,6CAAqB,CAAC,aAAa,KAAK,uDAA0B,CAAC;QAEnE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAgB,EAAE,QAAgB,GAAG;QACxD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAEjC,MAAM,QAAQ,GAAc,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAC7E,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CACzB,GAAG,CAAC,EAAE,CAAC,CAAC,uDAA0B,CAAC,6BAA6B,CAAC,IAAI,CACnE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnC,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,8DAA8D;SACjF,CAAC;QAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAChF,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,GAAG,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"dias.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":";;;AAGA,qGAAuG;AACvG,iGAAkG;AAClG,2FAAwF;AACxF,uFAAoF;AAKpF,MAAsB,sBAAuB,SAAQ,0DAA8B;IAEjF,wBAAwB;QACtB,OAAO,IAAI,yDAA6B,EAAE,CAAC;IAC7C,CAAC;IACQ,UAAU,GAAkC,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAErF,mBAAmB,GAAW,uDAA0B,CAAC,mBAAmB,CAAC;IAE7E;QACE,KAAK,EAAE,CAAC;QAER,6CAAqB,CAAC,aAAa,KAAK,uDAA0B,CAAC;QAEnE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAgB,EAAE,QAAgB,GAAG;QACxD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAEjC,MAAM,QAAQ,GAAc,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAC7E,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CACzB,GAAG,CAAC,EAAE,CAAC,CAAC,uDAA0B,CAAC,6BAA6B,CAAC,IAAI,CACnE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnC,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,8DAA8D;SACjF,CAAC;QAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAChF,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,GAAG,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAEjE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAvCD,wDAuCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from '../discord-bot';
|
|
2
2
|
export * from '../open-ai';
|
|
3
3
|
export * from './_collections/dias-global-settings.const';
|
|
4
|
+
export * from './_collections/dias.util';
|
|
4
5
|
export * from './_models/dias-global-settings.interface';
|
|
5
6
|
export * from './_models/dias-knowledge.data-model';
|
|
6
7
|
export * from './_services/dias-chunk.data-service';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/_modules/discord-assistant/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAI3B,cAAc,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/_modules/discord-assistant/index.ts"],"names":[],"mappings":"AAaA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAI3B,cAAc,2CAA2C,CAAC;AAC1D,cAAc,0BAA0B,CAAC;AAGzC,cAAc,0CAA0C,CAAC;AACzD,cAAc,qCAAqC,CAAC;AAGpD,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,+BAA+B,CAAC"}
|
|
@@ -12,6 +12,7 @@ tslib_1.__exportStar(require("../discord-bot"), exports);
|
|
|
12
12
|
tslib_1.__exportStar(require("../open-ai"), exports);
|
|
13
13
|
// COLLECTIONS
|
|
14
14
|
tslib_1.__exportStar(require("./_collections/dias-global-settings.const"), exports);
|
|
15
|
+
tslib_1.__exportStar(require("./_collections/dias.util"), exports);
|
|
15
16
|
// MODELS
|
|
16
17
|
tslib_1.__exportStar(require("./_models/dias-global-settings.interface"), exports);
|
|
17
18
|
tslib_1.__exportStar(require("./_models/dias-knowledge.data-model"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/discord-assistant/index.ts"],"names":[],"mappings":";AAIA,EAAE;AACF,sCAAsC;AACtC,EAAE;AACF,oEAAoE;AACpE,+DAA+D;AAC/D,EAAE;;;AAGF,eAAe;AACf,yDAA+B;AAC/B,qDAA2B;AAG3B,cAAc;AACd,oFAA0D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/discord-assistant/index.ts"],"names":[],"mappings":";AAIA,EAAE;AACF,sCAAsC;AACtC,EAAE;AACF,oEAAoE;AACpE,+DAA+D;AAC/D,EAAE;;;AAGF,eAAe;AACf,yDAA+B;AAC/B,qDAA2B;AAG3B,cAAc;AACd,oFAA0D;AAC1D,mEAAyC;AAEzC,SAAS;AACT,mFAAyD;AACzD,8EAAoD;AAEpD,WAAW;AACX,8EAAoD;AACpD,8EAAoD;AACpD,gFAAsD;AACtD,wEAA8C"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Guild, Message } from 'discord.js';
|
|
2
2
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
3
3
|
import { DyNTS_DiBo_Main_ControlService } from './dibo-main.control-service';
|
|
4
|
-
export declare abstract class
|
|
5
|
-
static getInstance():
|
|
4
|
+
export declare abstract class DyNTS_DiBo_Commands_ControlService extends DyNTS_SingletonService {
|
|
5
|
+
static getInstance(): DyNTS_DiBo_Commands_ControlService;
|
|
6
6
|
protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
|
|
7
7
|
protected readonly mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
|
|
8
8
|
get discordServer(): Guild;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-commands.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-commands.control-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAI5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAK7E,8BAAsB,
|
|
1
|
+
{"version":3,"file":"dibo-commands.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-commands.control-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAI5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAK7E,8BAAsB,kCAAmC,SAAQ,sBAAsB;IAErF,MAAM,CAAC,WAAW,IAAI,kCAAkC;IAIxD,SAAS,CAAC,QAAQ,CAAC,+BAA+B,IAAI,8BAA8B;IACpF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAC3B;IAEzC,IAAI,aAAa,IAAI,KAAK,CAEzB;IAED,SAAS;IAkBH,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAuErE"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DyNTS_DiBo_Commands_ControlService = void 0;
|
|
4
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
5
5
|
const singleton_service_1 = require("../../../_services/base/singleton.service");
|
|
6
6
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
7
7
|
const dibo_global_settings_conts_1 = require("../_collections/dibo-global-settings.conts");
|
|
8
|
-
class
|
|
8
|
+
class DyNTS_DiBo_Commands_ControlService extends singleton_service_1.DyNTS_SingletonService {
|
|
9
9
|
static getInstance() {
|
|
10
|
-
return
|
|
10
|
+
return DyNTS_DiBo_Commands_ControlService.getSingletonInstance();
|
|
11
11
|
}
|
|
12
12
|
mainDiscordBot_CS = this.getMainDiscordBotControlService();
|
|
13
13
|
get discordServer() {
|
|
@@ -68,5 +68,5 @@ class Commands_ControlService extends singleton_service_1.DyNTS_SingletonService
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
exports.
|
|
71
|
+
exports.DyNTS_DiBo_Commands_ControlService = DyNTS_DiBo_Commands_ControlService;
|
|
72
72
|
//# sourceMappingURL=dibo-commands.control-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-commands.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-commands.control-service.ts"],"names":[],"mappings":";;;AAGA,sDAAmD;AAEnD,iFAAmF;AAEnF,uFAAoF;AACpF,2FAAwF;AAGxF,MAAsB,
|
|
1
|
+
{"version":3,"file":"dibo-commands.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-commands.control-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import { Guild, Message } from 'discord.js';
|
|
2
|
-
import {
|
|
2
|
+
import { DyNTS_DiBo_Commands_ControlService } from './dibo-commands.control-service';
|
|
3
3
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
4
4
|
import { DyNTS_DiBo_Main_ControlService } from './dibo-main.control-service';
|
|
5
5
|
export declare abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonService {
|
|
6
|
-
protected
|
|
6
|
+
protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
|
|
7
|
+
protected abstract mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
|
|
7
8
|
get discordServer(): Guild;
|
|
8
9
|
get botClientId(): string;
|
|
9
10
|
get botDisplayName(): string;
|
|
10
|
-
protected abstract getCommandsControlService():
|
|
11
|
-
protected
|
|
12
|
-
|
|
11
|
+
protected abstract getCommandsControlService(): DyNTS_DiBo_Commands_ControlService;
|
|
12
|
+
protected commands_CS: DyNTS_DiBo_Commands_ControlService;
|
|
13
|
+
start(issuer: string): Promise<void>;
|
|
13
14
|
handleNewMessage(message: Message, issuer: string): Promise<void>;
|
|
14
|
-
abstract handleMessage(message: Message, issuer: string): Promise<
|
|
15
|
+
abstract handleMessage(message: Message, issuer: string): Promise<Message>;
|
|
15
16
|
getMessageIsForBotToHandle(message: Message, issuer: string): Promise<boolean>;
|
|
16
17
|
handleIfCommand(message: Message, issuer: string): Promise<boolean>;
|
|
17
18
|
isCommand(message: Message, issuer: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-io.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-io.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAA2B,OAAO,EAAe,MAAM,YAAY,CAAA;AAI5G,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dibo-io.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-io.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAA2B,OAAO,EAAe,MAAM,YAAY,CAAA;AAI5G,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAA;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAM5E,8BAAsB,4BAA6B,SAAQ,sBAAsB;IAM/E,SAAS,CAAC,QAAQ,CAAC,+BAA+B,IAAI,8BAA8B;IACpF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAAC;IAErE,IAAI,aAAa,IAAI,KAAK,CAEzB;IACD,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,SAAS,CAAC,QAAQ,CAAC,yBAAyB,IAAI,kCAAkC;IAClF,SAAS,CAAC,WAAW,EAAE,kCAAkC,CAAC;IAMpD,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BpC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCvE,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAEpE,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2G9E,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBnE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CA8BpE"}
|
|
@@ -7,10 +7,6 @@ const global_settings_const_1 = require("../../../_collections/global-settings.c
|
|
|
7
7
|
const dibo_global_settings_conts_1 = require("../_collections/dibo-global-settings.conts");
|
|
8
8
|
/* type T_Main_CS = DyNTS_DiBo_Main_ControlService; */
|
|
9
9
|
class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonService {
|
|
10
|
-
/* static getInstance(): DyNTS_DiBo_IO_ControlService {
|
|
11
|
-
return DyNTS_DiBo_IO_ControlService.getSingletonInstance();
|
|
12
|
-
} */
|
|
13
|
-
mainDiscordBot_CS;
|
|
14
10
|
get discordServer() {
|
|
15
11
|
return this.mainDiscordBot_CS.discordServer;
|
|
16
12
|
}
|
|
@@ -20,17 +16,30 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
20
16
|
get botDisplayName() {
|
|
21
17
|
return this.mainDiscordBot_CS.botDisplayName;
|
|
22
18
|
}
|
|
23
|
-
commands_CS
|
|
24
|
-
constructor() {
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
commands_CS;
|
|
20
|
+
/* protected constructor() {
|
|
21
|
+
super();
|
|
22
|
+
} */
|
|
23
|
+
async start(issuer) {
|
|
24
|
+
try {
|
|
25
|
+
this.mainDiscordBot_CS = this.getMainDiscordBotControlService();
|
|
26
|
+
this.commands_CS = this.getCommandsControlService();
|
|
27
|
+
if (!this.discordServer) {
|
|
28
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
29
|
+
...this.getDefaultErrorSettings('constructor', new Error('Discord server not yet initialized, ' +
|
|
30
|
+
'should only be called after DyNTS_DiBo_Main_ControlService.start'), 'system-init'),
|
|
31
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
27
36
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
28
|
-
...this.getDefaultErrorSettings('
|
|
29
|
-
|
|
30
|
-
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
|
|
37
|
+
...this.getDefaultErrorSettings('start', error, issuer),
|
|
38
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-S000`,
|
|
31
39
|
});
|
|
32
40
|
}
|
|
33
41
|
}
|
|
42
|
+
/* async */
|
|
34
43
|
async handleNewMessage(message, issuer) {
|
|
35
44
|
try {
|
|
36
45
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 1) {
|
|
@@ -74,10 +83,6 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
74
83
|
const isInDefaultChannel = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.defaultChannels.includes(channelName);
|
|
75
84
|
const isDMChannel = message.channel.isDMBased();
|
|
76
85
|
const isAllowedChannel = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.allowedChannels.includes(channelName) || (isDMChannel && dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.dmIsAllowed);
|
|
77
|
-
const isAllowedUser = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers === 'all' ||
|
|
78
|
-
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
|
|
79
|
-
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
|
|
80
|
-
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
|
|
81
86
|
if (!isAllowedChannel) {
|
|
82
87
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
83
88
|
fsm_dynamo_1.DyFM_Log.warn('🚫❌ not allowed channel. END');
|
|
@@ -112,6 +117,10 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
112
117
|
}
|
|
113
118
|
return false;
|
|
114
119
|
}
|
|
120
|
+
const isAllowedUser = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers === 'all' ||
|
|
121
|
+
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
|
|
122
|
+
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
|
|
123
|
+
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
|
|
115
124
|
if (!isAllowedUser) {
|
|
116
125
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
117
126
|
fsm_dynamo_1.DyFM_Log.warn('🚫❌ not allowed user. END', message.author.username, message.author.displayName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-io.control-service.ts"],"names":[],"mappings":";;;AAEA,sDAAwE;AAGxE,iFAAkF;AAElF,uFAAmF;AACnF,2FAAuF;AAEvF,sDAAsD;AAEtD,MAAsB,4BAA6B,SAAQ,0CAAsB;
|
|
1
|
+
{"version":3,"file":"dibo-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-io.control-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,KAAK,EAA8C,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE5H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAMzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAMjF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,cAAc,CAAQ;IAC9B,IAAI,aAAa,IAAI,KAAK,CAEzB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,SAAS,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,4BAA4B;IAEzE,SAAS,CAAC,WAAW,EAAE,kCAAkC,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,IAAI,kCAAkC;IAElF,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,aAAa,CAEd;IAEP,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS;IAwBH,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiIpC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"dibo-main.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,KAAK,EAA8C,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE5H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAE,kCAAkC,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAMzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,8BAAsB,8BAA+B,SAAQ,sBAAsB;IAMjF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,cAAc,CAAQ;IAC9B,IAAI,aAAa,IAAI,KAAK,CAEzB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IACD,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,SAAS,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,4BAA4B;IAEzE,SAAS,CAAC,WAAW,EAAE,kCAAkC,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,IAAI,kCAAkC;IAElF,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,aAAa,CAEd;IAEP,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS;IAwBH,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiIpC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ9D,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMrC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;CAQnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -64,7 +64,7 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
64
64
|
debugLog = false;
|
|
65
65
|
constructor() {
|
|
66
66
|
super();
|
|
67
|
-
global_settings_const_1.DyNTS_global_settings.bot_settings
|
|
67
|
+
global_settings_const_1.DyNTS_global_settings.bot_settings ??= dibo_global_settings_conts_1.DyNTS_DiBo_global_settings;
|
|
68
68
|
if (this.client) {
|
|
69
69
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
70
70
|
...this.getDefaultErrorSettings('start', new Error('Discord client already initialized'), 'system-init'),
|
|
@@ -175,6 +175,7 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
175
175
|
this.botIO_CS = this.getBotIOControlService();
|
|
176
176
|
this.routines_CS = this.getRoutinesControlService();
|
|
177
177
|
await this.routines_CS.start(issuer);
|
|
178
|
+
await this.botIO_CS.start(issuer);
|
|
178
179
|
}
|
|
179
180
|
catch (error) {
|
|
180
181
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":";;;AAAA,2CAA4H;AAE5H,iFAAmF;AACnF,sDAAyE;AACzE,uFAAoF;AAGpF,2FAAwF;AACxF,2EAA6E;AAC7E,+EAAkF;AAGlF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAsB,8BAA+B,SAAQ,0CAAsB;IAEjF;;QAEI;IAEK,MAAM,CAAS;IAEhB,cAAc,CAAQ;IAC9B,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,6CAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;IACrF,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;IACvC,CAAC;IAES,QAAQ,CAA+B;IAGvC,WAAW,CAAqC;IAGlD,gBAAgB,GAEpB,EAAE,CAAC;IAEC,aAAa,GAEjB,EAAE,CAAC;IAEG,QAAQ,GAAG,KAAK,CAAC;IAE3B;QACE,KAAK,EAAE,CAAC;QAER,6CAAqB,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"dibo-main.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-main.control-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -353,7 +353,7 @@ export declare class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_Service
|
|
|
353
353
|
*/
|
|
354
354
|
getAnswerInConversation(set: {
|
|
355
355
|
conversation: DyNTS_OAI_GPT_Message[];
|
|
356
|
-
newMessage
|
|
356
|
+
newMessage?: string;
|
|
357
357
|
issuer: string;
|
|
358
358
|
settings?: DyFM_GPTCall_Settings;
|
|
359
359
|
debugLog?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-llm-chat.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oai-llm-chat.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -233,10 +233,12 @@ class DyNTS_OAI_LLMChat_ServiceBase extends oai_llm_service_base_1.DyNTS_OAI_LLM
|
|
|
233
233
|
* Uses the {@link resolveConversation}
|
|
234
234
|
*/
|
|
235
235
|
async getAnswerInConversation(set) {
|
|
236
|
-
set.
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
236
|
+
if (set.newMessage) {
|
|
237
|
+
set.conversation.push({
|
|
238
|
+
role: oai_gpt_message_role_enum_1.DyNTS_OAI_GPT_Message_Role.user,
|
|
239
|
+
content: set.newMessage,
|
|
240
|
+
});
|
|
241
|
+
}
|
|
240
242
|
const answer = await this.resolveConversationMessage(set);
|
|
241
243
|
if (set.debugLog || this.debugLog) {
|
|
242
244
|
console.log(' - answer: ', answer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-llm-chat.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oai-llm-chat.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Message } from 'discord.js';
|
|
1
|
+
import { Message, TextChannel } from 'discord.js';
|
|
2
2
|
import { DyNTS_OAI_GPT_Message } from '../../open-ai/_models/interfaces/oai-gpt-message.interface';
|
|
3
3
|
import { DyNTS_DiAs_global_settings } from './dias-global-settings.const';
|
|
4
4
|
import { DyNTS_OAI_GPT_Message_Role } from '../../open-ai';
|
|
5
|
+
import { DyFM_Error } from '@futdevpro/fsm-dynamo';
|
|
5
6
|
|
|
6
7
|
|
|
7
8
|
export class DyNTS_DiAs_Util {
|
|
@@ -40,4 +41,81 @@ export class DyNTS_DiAs_Util {
|
|
|
40
41
|
}
|
|
41
42
|
})
|
|
42
43
|
}
|
|
44
|
+
|
|
45
|
+
static async gatherMessagesAsOAIConversation(
|
|
46
|
+
message: Message,
|
|
47
|
+
botClientId: string,
|
|
48
|
+
botDisplayName: string,
|
|
49
|
+
issuer: string,
|
|
50
|
+
skipFlags?: string[],
|
|
51
|
+
): Promise<DyNTS_OAI_GPT_Message[]> {
|
|
52
|
+
const messages = await this.gatherMessagesForMessage(message, botClientId, issuer, skipFlags);
|
|
53
|
+
|
|
54
|
+
return DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation(
|
|
55
|
+
messages,
|
|
56
|
+
botClientId,
|
|
57
|
+
botDisplayName,
|
|
58
|
+
);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
static async gatherMessagesForMessage(
|
|
62
|
+
message: Message,
|
|
63
|
+
botClientId: string,
|
|
64
|
+
issuer: string,
|
|
65
|
+
skipFlags?: string[],
|
|
66
|
+
): Promise<Message[]> {
|
|
67
|
+
if (!message.channel.isTextBased()) {
|
|
68
|
+
throw new Error('Message channel is not a text channel!');
|
|
69
|
+
}
|
|
70
|
+
return this.gatherMessages({
|
|
71
|
+
channel: message.channel as TextChannel,
|
|
72
|
+
userId: message.author.id,
|
|
73
|
+
botClientId: botClientId,
|
|
74
|
+
skipFlags: skipFlags,
|
|
75
|
+
issuer: issuer,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
static async gatherMessages(
|
|
80
|
+
set: {
|
|
81
|
+
/* message: Message, */
|
|
82
|
+
channel: TextChannel,
|
|
83
|
+
userId: string,
|
|
84
|
+
botClientId: string,
|
|
85
|
+
skipFlags?: string[],
|
|
86
|
+
issuer: string,
|
|
87
|
+
}
|
|
88
|
+
): Promise<Message[]> {
|
|
89
|
+
try {
|
|
90
|
+
if (!set.channel.isTextBased()) {
|
|
91
|
+
throw new Error('Message channel is not a text channel!');
|
|
92
|
+
}
|
|
93
|
+
const messages: Message[] = await set.channel.messages.fetch({
|
|
94
|
+
limit: 100,
|
|
95
|
+
}).then(
|
|
96
|
+
messages => {
|
|
97
|
+
if (set.skipFlags) {
|
|
98
|
+
messages = messages.filter(
|
|
99
|
+
msg => !set.skipFlags.some(flag => msg.content.includes(flag))
|
|
100
|
+
)
|
|
101
|
+
}
|
|
102
|
+
return messages.map(msg => msg)
|
|
103
|
+
}
|
|
104
|
+
);
|
|
105
|
+
|
|
106
|
+
if (messages.some(msg => ![ set.botClientId, set.userId ].includes(msg.author.id))) {
|
|
107
|
+
messages.forEach(msg => {
|
|
108
|
+
msg.content = `**${msg.author.displayName}** ${msg.content}`;
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
return messages;
|
|
113
|
+
} catch (error) {
|
|
114
|
+
throw new DyFM_Error({
|
|
115
|
+
errorCode: 'DIA-DU-GM0',
|
|
116
|
+
error: error,
|
|
117
|
+
//...this.getDefaultErrorSettings('gatherMessages', error, set.issuer),
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
}
|
|
43
121
|
}
|
|
@@ -16,7 +16,8 @@ export abstract class DyNTS_DiAs_IO_ControlService extends DyNTS_DiBo_IO_Control
|
|
|
16
16
|
} */
|
|
17
17
|
|
|
18
18
|
/* abstract override getMainDiscordBotControlService(): DyNTS_DiAs_Main_ControlService; */
|
|
19
|
-
protected abstract override
|
|
19
|
+
protected abstract override getMainDiscordBotControlService(): DyNTS_DiAs_Main_ControlService;
|
|
20
|
+
protected abstract override mainDiscordBot_CS: DyNTS_DiAs_Main_ControlService;
|
|
20
21
|
/* =
|
|
21
22
|
this.getMainDiscordBotControlService(); */
|
|
22
23
|
|
|
@@ -24,7 +25,7 @@ export abstract class DyNTS_DiAs_IO_ControlService extends DyNTS_DiBo_IO_Control
|
|
|
24
25
|
return this.mainDiscordBot_CS.llmChat_CS;
|
|
25
26
|
}
|
|
26
27
|
|
|
27
|
-
override async handleMessage(message: Message, issuer: string): Promise<
|
|
28
|
+
override async handleMessage(message: Message, issuer: string): Promise<Message> {
|
|
28
29
|
try {
|
|
29
30
|
const messages: Message[] = await this.mainDiscordBot_CS.gatherMessages(message);
|
|
30
31
|
const oaiMessages: DyNTS_OAI_GPT_Message[] =
|
|
@@ -42,7 +43,7 @@ export abstract class DyNTS_DiAs_IO_ControlService extends DyNTS_DiBo_IO_Control
|
|
|
42
43
|
},
|
|
43
44
|
});
|
|
44
45
|
|
|
45
|
-
await message.reply(gptResult);
|
|
46
|
+
return await message.reply(gptResult);
|
|
46
47
|
} catch (error) {
|
|
47
48
|
DyFM_Error.logSimple('❌❌ Error handleNewMessage:', error);
|
|
48
49
|
|
|
@@ -12,7 +12,7 @@ export abstract class DyNTS_DiAs_Main_ControlService extends DyNTS_DiAs_ServiceB
|
|
|
12
12
|
protected abstract override botIO_CS: DyNTS_DiAs_IO_ControlService;
|
|
13
13
|
protected abstract override getBotIOControlService(): DyNTS_DiAs_IO_ControlService;
|
|
14
14
|
|
|
15
|
-
override async start(issuer: string): Promise<void> {
|
|
15
|
+
/* override async start(issuer: string): Promise<void> {
|
|
16
16
|
try {
|
|
17
17
|
await super.start(issuer);
|
|
18
18
|
|
|
@@ -24,5 +24,5 @@ export abstract class DyNTS_DiAs_Main_ControlService extends DyNTS_DiAs_ServiceB
|
|
|
24
24
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiAs-MCS-S0`,
|
|
25
25
|
})
|
|
26
26
|
}
|
|
27
|
-
}
|
|
27
|
+
} */
|
|
28
28
|
}
|
|
@@ -9,10 +9,10 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
|
|
|
9
9
|
import { DyNTS_DiBo_global_settings } from '../_collections/dibo-global-settings.conts';
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
export abstract class
|
|
12
|
+
export abstract class DyNTS_DiBo_Commands_ControlService extends DyNTS_SingletonService {
|
|
13
13
|
|
|
14
|
-
static getInstance():
|
|
15
|
-
return
|
|
14
|
+
static getInstance(): DyNTS_DiBo_Commands_ControlService {
|
|
15
|
+
return DyNTS_DiBo_Commands_ControlService.getSingletonInstance();
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
|
|
@@ -2,7 +2,7 @@ import { Client, GatewayIntentBits, Guild, Collection, GuildMember, Message, Tex
|
|
|
2
2
|
import * as dotenv from 'dotenv'
|
|
3
3
|
import { DyFM_Error, DyFM_Log, hour, week } from '@futdevpro/fsm-dynamo'
|
|
4
4
|
import { DyNTS_DiBo_Routines_ControlService } from './dibo-routines.control-service'
|
|
5
|
-
import {
|
|
5
|
+
import { DyNTS_DiBo_Commands_ControlService } from './dibo-commands.control-service'
|
|
6
6
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service'
|
|
7
7
|
import { DyNTS_DiBo_Main_ControlService } from './dibo-main.control-service'
|
|
8
8
|
import { DyNTS_global_settings } from '../../../_collections/global-settings.const'
|
|
@@ -16,7 +16,8 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
16
16
|
return DyNTS_DiBo_IO_ControlService.getSingletonInstance();
|
|
17
17
|
} */
|
|
18
18
|
|
|
19
|
-
protected
|
|
19
|
+
protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
|
|
20
|
+
protected abstract mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
|
|
20
21
|
|
|
21
22
|
get discordServer(): Guild {
|
|
22
23
|
return this.mainDiscordBot_CS.discordServer;
|
|
@@ -28,26 +29,40 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
28
29
|
return this.mainDiscordBot_CS.botDisplayName;
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
protected abstract getCommandsControlService():
|
|
32
|
-
protected
|
|
32
|
+
protected abstract getCommandsControlService(): DyNTS_DiBo_Commands_ControlService;
|
|
33
|
+
protected commands_CS: DyNTS_DiBo_Commands_ControlService;
|
|
33
34
|
|
|
34
|
-
protected constructor() {
|
|
35
|
+
/* protected constructor() {
|
|
35
36
|
super();
|
|
37
|
+
} */
|
|
36
38
|
|
|
37
|
-
|
|
39
|
+
async start(issuer: string): Promise<void> {
|
|
40
|
+
try {
|
|
41
|
+
this.mainDiscordBot_CS = this.getMainDiscordBotControlService();
|
|
42
|
+
this.commands_CS = this.getCommandsControlService();
|
|
43
|
+
|
|
44
|
+
if (!this.discordServer) {
|
|
45
|
+
throw new DyFM_Error({
|
|
46
|
+
...this.getDefaultErrorSettings(
|
|
47
|
+
'constructor',
|
|
48
|
+
new Error(
|
|
49
|
+
'Discord server not yet initialized, ' +
|
|
50
|
+
'should only be called after DyNTS_DiBo_Main_ControlService.start'
|
|
51
|
+
),
|
|
52
|
+
'system-init'
|
|
53
|
+
),
|
|
54
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
|
|
55
|
+
})
|
|
56
|
+
}
|
|
57
|
+
} catch (error) {
|
|
38
58
|
throw new DyFM_Error({
|
|
39
|
-
...this.getDefaultErrorSettings(
|
|
40
|
-
|
|
41
|
-
new Error(
|
|
42
|
-
'Discord server not yet initialized, ' +
|
|
43
|
-
'should only be called after DyNTS_DiBo_Main_ControlService.start'
|
|
44
|
-
),
|
|
45
|
-
'system-init'
|
|
46
|
-
),
|
|
47
|
-
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-C000`,
|
|
59
|
+
...this.getDefaultErrorSettings('start', error, issuer),
|
|
60
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-S000`,
|
|
48
61
|
})
|
|
49
62
|
}
|
|
50
|
-
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/* async */
|
|
51
66
|
|
|
52
67
|
async handleNewMessage(message: Message, issuer: string): Promise<void> {
|
|
53
68
|
try {
|
|
@@ -87,7 +102,7 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
87
102
|
}
|
|
88
103
|
}
|
|
89
104
|
|
|
90
|
-
abstract handleMessage(message: Message, issuer: string): Promise<
|
|
105
|
+
abstract handleMessage(message: Message, issuer: string): Promise<Message>;
|
|
91
106
|
|
|
92
107
|
async getMessageIsForBotToHandle(message: Message, issuer: string): Promise<boolean> {
|
|
93
108
|
try {
|
|
@@ -111,10 +126,6 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
111
126
|
const isAllowedChannel = DyNTS_DiBo_global_settings.channelSettings.allowedChannels.includes(
|
|
112
127
|
channelName
|
|
113
128
|
) || (isDMChannel && DyNTS_DiBo_global_settings.channelSettings.dmIsAllowed);
|
|
114
|
-
const isAllowedUser = DyNTS_DiBo_global_settings.allowedUsers === 'all' ||
|
|
115
|
-
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
|
|
116
|
-
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
|
|
117
|
-
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
|
|
118
129
|
|
|
119
130
|
if (!isAllowedChannel) {
|
|
120
131
|
if (DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
@@ -167,6 +178,11 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
167
178
|
return false;
|
|
168
179
|
}
|
|
169
180
|
|
|
181
|
+
const isAllowedUser = DyNTS_DiBo_global_settings.allowedUsers === 'all' ||
|
|
182
|
+
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.id) ||
|
|
183
|
+
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.username) ||
|
|
184
|
+
DyNTS_DiBo_global_settings.allowedUsers.includes(message.author.displayName);
|
|
185
|
+
|
|
170
186
|
if (!isAllowedUser) {
|
|
171
187
|
if (DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
172
188
|
DyFM_Log.warn('🚫❌ not allowed user. END', message.author.username, message.author.displayName)
|
|
@@ -83,7 +83,7 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
|
|
|
83
83
|
protected constructor() {
|
|
84
84
|
super();
|
|
85
85
|
|
|
86
|
-
DyNTS_global_settings.bot_settings
|
|
86
|
+
DyNTS_global_settings.bot_settings ??= DyNTS_DiBo_global_settings;
|
|
87
87
|
|
|
88
88
|
if (this.client) {
|
|
89
89
|
throw new DyFM_Error({
|
|
@@ -239,6 +239,7 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
|
|
|
239
239
|
this.routines_CS = this.getRoutinesControlService();
|
|
240
240
|
|
|
241
241
|
await this.routines_CS.start(issuer);
|
|
242
|
+
await this.botIO_CS.start(issuer);
|
|
242
243
|
|
|
243
244
|
} catch (error) {
|
|
244
245
|
throw new DyFM_Error({
|
|
@@ -439,7 +439,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
|
|
|
439
439
|
async getAnswerInConversation(
|
|
440
440
|
set: {
|
|
441
441
|
conversation: DyNTS_OAI_GPT_Message[],
|
|
442
|
-
newMessage
|
|
442
|
+
newMessage?: string,
|
|
443
443
|
issuer: string,
|
|
444
444
|
settings?: DyFM_GPTCall_Settings,
|
|
445
445
|
debugLog?: boolean,
|
|
@@ -447,10 +447,12 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
|
|
|
447
447
|
replaceThisInLog?: string,
|
|
448
448
|
}
|
|
449
449
|
): Promise<string> {
|
|
450
|
-
set.
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
450
|
+
if (set.newMessage) {
|
|
451
|
+
set.conversation.push({
|
|
452
|
+
role: DyNTS_OAI_GPT_Message_Role.user,
|
|
453
|
+
content: set.newMessage,
|
|
454
|
+
});
|
|
455
|
+
}
|
|
454
456
|
|
|
455
457
|
const answer: string = await this.resolveConversationMessage(set);
|
|
456
458
|
|