@futdevpro/nts-dynamo 1.11.16 → 1.11.18
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-chunk.data-service.d.ts +1 -1
- package/build/_modules/discord-assistant/_services/dias-chunk.data-service.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-chunk.data-service.js +31 -13
- package/build/_modules/discord-assistant/_services/dias-chunk.data-service.js.map +1 -1
- package/build/_modules/discord-assistant/_services/dias-io.control-service.d.ts +2 -1
- 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 +6 -2
- 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/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/_collections/dibo-global-settings.conts.d.ts +1 -1
- package/build/_modules/discord-bot/_collections/dibo-global-settings.conts.d.ts.map +1 -1
- package/build/_modules/discord-bot/_models/dibo-global-settings.interface.d.ts +88 -0
- package/build/_modules/discord-bot/_models/dibo-global-settings.interface.d.ts.map +1 -0
- package/build/_modules/discord-bot/_models/dibo-global-settings.interface.js +3 -0
- package/build/_modules/discord-bot/_models/dibo-global-settings.interface.js.map +1 -0
- 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 +6 -5
- 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/discord-bot/_services/dibo-routines.control-service.d.ts +0 -1
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.d.ts.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.js +0 -3
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.js.map +1 -1
- package/build/_modules/discord-bot/index.d.ts +1 -1
- package/build/_modules/discord-bot/index.d.ts.map +1 -1
- package/build/_modules/discord-bot/index.js +1 -1
- package/build/_modules/discord-bot/index.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.d.ts +284 -58
- 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 +91 -104
- package/build/_modules/open-ai/_services/oai-llm-chat.service-base.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm.service-base.d.ts +246 -53
- package/build/_modules/open-ai/_services/oai-llm.service-base.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm.service-base.js +86 -96
- package/build/_modules/open-ai/_services/oai-llm.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-chunk.data-service.ts +26 -25
- package/src/_modules/discord-assistant/_services/dias-io.control-service.ts +8 -7
- package/src/_modules/discord-assistant/_services/dias-main.control-service.ts +2 -2
- package/src/_modules/discord-assistant/index.ts +1 -0
- package/src/_modules/discord-bot/_collections/dibo-global-settings.conts.ts +1 -1
- package/src/_modules/discord-bot/_services/dibo-commands.control-service.ts +3 -3
- package/src/_modules/discord-bot/_services/dibo-io.control-service.ts +36 -20
- package/src/_modules/discord-bot/_services/dibo-main.control-service.ts +2 -1
- package/src/_modules/discord-bot/_services/dibo-routines.control-service.ts +2 -2
- package/src/_modules/discord-bot/index.ts +1 -1
- package/src/_modules/open-ai/_services/oai-llm-chat.service-base.ts +233 -249
- package/src/_modules/open-ai/_services/oai-llm.service-base.ts +189 -147
- /package/src/_modules/discord-bot/_models/{global-bot-log-settings.interface.ts → dibo-global-settings.interface.ts} +0 -0
|
@@ -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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"}
|
|
@@ -11,7 +11,7 @@ export declare abstract class DyNTS_DiAs_Chunk_DataService<T_Chunk extends DyNTS
|
|
|
11
11
|
get llmChat_CS(): DyNTS_OAI_LLMChat_ServiceBase;
|
|
12
12
|
constructor(issuer: string, dataParams?: DyFM_DataModel_Params<T_Chunk>, openAiSettings?: DyFM_OpenAI_Settings);
|
|
13
13
|
abstract getPageLink(page: T_Page, issuer: string): string;
|
|
14
|
-
resolveConversation(conversation: DyNTS_OAI_GPT_Message[]): Promise<string>;
|
|
14
|
+
resolveConversation(conversation: DyNTS_OAI_GPT_Message[], limit?: number, numberOfCandidates?: number): Promise<string>;
|
|
15
15
|
vectorSearchAndResolveConversation(conversation: DyNTS_OAI_GPT_Message[], limit?: number, numberOfCandidates?: number): Promise<string>;
|
|
16
16
|
vectorSearchUsingConversation(conversation: DyNTS_OAI_GPT_Message[], limit?: number, numberOfCandidates?: number): Promise<T_Chunk[]>;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-chunk.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAqC,MAAM,gDAAgD,CAAC;AACpH,OAAO,EAAE,+BAA+B,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAwB,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAGnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AAItG,8BAAsB,4BAA4B,CAChD,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAChF,SAAQ,+BAA+B,CAAC,OAAO,EAAE,MAAM,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAAC;IAE9E,IAAI,UAAU,IAAI,6BAA6B,CAE9C;gBAGC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAC3C,cAAc,CAAC,EAAE,oBAAoB;IAmBvC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAEpD,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"dias-chunk.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAqC,MAAM,gDAAgD,CAAC;AACpH,OAAO,EAAE,+BAA+B,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAwB,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAGnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AAItG,8BAAsB,4BAA4B,CAChD,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAChF,SAAQ,+BAA+B,CAAC,OAAO,EAAE,MAAM,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAAC;IAE9E,IAAI,UAAU,IAAI,6BAA6B,CAE9C;gBAGC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAC3C,cAAc,CAAC,EAAE,oBAAoB;IAmBvC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAEpD,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,EAAE,EACrC,KAAK,GAAE,MAAW,EAClB,kBAAkB,GAAE,MAAY,GAC/B,OAAO,CAAC,MAAM,CAAC;IAsCZ,kCAAkC,CACtC,YAAY,EAAE,qBAAqB,EAAE,EACrC,KAAK,GAAE,MAAU,EACjB,kBAAkB,GAAE,MAAY,GAC/B,OAAO,CAAC,MAAM,CAAC;IAuCZ,6BAA6B,CACjC,YAAY,EAAE,qBAAqB,EAAE,EACrC,KAAK,GAAE,MAAU,EACjB,kBAAkB,GAAE,MAAY,GAC/B,OAAO,CAAC,OAAO,EAAE,CAAC;CAgCtB"}
|
|
@@ -24,19 +24,28 @@ class DyNTS_DiAs_Chunk_DataService extends oai_chunk_service_base_1.DyNTS_OAI_Ch
|
|
|
24
24
|
},
|
|
25
25
|
}), issuer);
|
|
26
26
|
}
|
|
27
|
-
async resolveConversation(conversation) {
|
|
27
|
+
async resolveConversation(conversation, limit = 10, numberOfCandidates = 200) {
|
|
28
28
|
try {
|
|
29
29
|
fsm_dynamo_1.DyFM_Log.info('🔍 Document message received:', conversation[conversation.length - 1].content);
|
|
30
|
-
const vectorSearchNeeded = await this.llmChat_CS.yesNoQuestionInConversation(
|
|
31
|
-
|
|
30
|
+
const vectorSearchNeeded = await this.llmChat_CS.yesNoQuestionInConversation({
|
|
31
|
+
conversation: conversation,
|
|
32
|
+
question: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.vectorSearch.doWeNeedVectorSearch,
|
|
33
|
+
issuer: this.issuer,
|
|
34
|
+
settings: {
|
|
35
|
+
systemPrompt: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt,
|
|
36
|
+
},
|
|
32
37
|
});
|
|
33
38
|
let result;
|
|
34
39
|
if (vectorSearchNeeded) {
|
|
35
|
-
result = await this.vectorSearchAndResolveConversation(conversation,
|
|
40
|
+
result = await this.vectorSearchAndResolveConversation(conversation, limit, numberOfCandidates);
|
|
36
41
|
}
|
|
37
42
|
else {
|
|
38
|
-
result = await this.llmChat_CS.
|
|
39
|
-
|
|
43
|
+
result = await this.llmChat_CS.resolveConversationMessage({
|
|
44
|
+
conversation: conversation,
|
|
45
|
+
issuer: this.issuer,
|
|
46
|
+
settings: {
|
|
47
|
+
systemPrompt: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt,
|
|
48
|
+
},
|
|
40
49
|
});
|
|
41
50
|
}
|
|
42
51
|
return result;
|
|
@@ -62,10 +71,14 @@ class DyNTS_DiAs_Chunk_DataService extends oai_chunk_service_base_1.DyNTS_OAI_Ch
|
|
|
62
71
|
`\n${result.chunkContent.replace(/\n/g, '\n ')}`;
|
|
63
72
|
}).join('\n\n');
|
|
64
73
|
fsm_dynamo_1.DyFM_Log.H_success(`✅ Document search results:`, parsedSearchResults);
|
|
65
|
-
const result = await this.llmChat_CS.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
74
|
+
const result = await this.llmChat_CS.resolveConversationMessage({
|
|
75
|
+
conversation: conversation,
|
|
76
|
+
issuer: this.issuer,
|
|
77
|
+
settings: {
|
|
78
|
+
systemPrompt: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt +
|
|
79
|
+
oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.vectorSearch.resolveSearchResults +
|
|
80
|
+
parsedSearchResults,
|
|
81
|
+
},
|
|
69
82
|
});
|
|
70
83
|
return result;
|
|
71
84
|
}
|
|
@@ -80,9 +93,14 @@ class DyNTS_DiAs_Chunk_DataService extends oai_chunk_service_base_1.DyNTS_OAI_Ch
|
|
|
80
93
|
async vectorSearchUsingConversation(conversation, limit = 3, numberOfCandidates = 100) {
|
|
81
94
|
try {
|
|
82
95
|
const lastMessage = conversation[conversation.length - 1];
|
|
83
|
-
const searchQuestion = await this.llmChat_CS.getAnswerInConversation(
|
|
84
|
-
|
|
85
|
-
|
|
96
|
+
const searchQuestion = await this.llmChat_CS.getAnswerInConversation({
|
|
97
|
+
conversation: conversation,
|
|
98
|
+
newMessage: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.vectorSearch.getSearchQuestion,
|
|
99
|
+
issuer: this.issuer,
|
|
100
|
+
settings: {
|
|
101
|
+
systemPrompt: oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt +
|
|
102
|
+
oai_llm_predefined_requests_conts_1.DyNTS_OAI_LLMDefaultPredefined_Requests.vectorSearch.systemPrompt,
|
|
103
|
+
},
|
|
86
104
|
});
|
|
87
105
|
fsm_dynamo_1.DyFM_Log.testInfo('🔍 Document search question:', searchQuestion);
|
|
88
106
|
const searchResults = await this.vectorSearch({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dias-chunk.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":";;;AAAA,6FAAoH;AACpH,2FAAiG;AACjG,sDAAoF;AACpF,2DAAuF;AAIvF,oHAAuH;AAGvH,uFAAoF;AAGpF,MAAsB,4BAGpB,SAAQ,wDAAgD;IAIxD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;IAC3C,CAAC;IAED,YACE,MAAc,EACd,UAA2C,EAC3C,cAAqC;QAErC,KAAK,CACH,UAAU,IAAI,4DAAmE,EACjF,cAAc;YACZ,IAAI,8BAAoB,CAAC;gBACvB,YAAY,EAAE;oBACZ,MAAM,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM;oBACxD,YAAY,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY;oBACpE,OAAO,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO;iBAC3D;gBACD,eAAe,EAAE;oBACf,QAAQ,EAAE,0BAAgB,CAAC,oBAAoB;iBAChD;aACF,CAAC,EACJ,MAAM,CACP,CAAC;IACJ,CAAC;IAID,KAAK,CAAC,mBAAmB,CACvB,YAAqC;
|
|
1
|
+
{"version":3,"file":"dias-chunk.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias-chunk.data-service.ts"],"names":[],"mappings":";;;AAAA,6FAAoH;AACpH,2FAAiG;AACjG,sDAAoF;AACpF,2DAAuF;AAIvF,oHAAuH;AAGvH,uFAAoF;AAGpF,MAAsB,4BAGpB,SAAQ,wDAAgD;IAIxD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;IAC3C,CAAC;IAED,YACE,MAAc,EACd,UAA2C,EAC3C,cAAqC;QAErC,KAAK,CACH,UAAU,IAAI,4DAAmE,EACjF,cAAc;YACZ,IAAI,8BAAoB,CAAC;gBACvB,YAAY,EAAE;oBACZ,MAAM,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM;oBACxD,YAAY,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY;oBACpE,OAAO,EAAE,6CAAqB,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO;iBAC3D;gBACD,eAAe,EAAE;oBACf,QAAQ,EAAE,0BAAgB,CAAC,oBAAoB;iBAChD;aACF,CAAC,EACJ,MAAM,CACP,CAAC;IACJ,CAAC;IAID,KAAK,CAAC,mBAAmB,CACvB,YAAqC,EACrC,QAAgB,EAAE,EAClB,qBAA6B,GAAG;QAEhC,IAAI,CAAC;YACH,qBAAQ,CAAC,IAAI,CAAC,+BAA+B,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE9F,MAAM,kBAAkB,GAAY,MAAM,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC;gBACpF,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,2EAAuC,CAAC,YAAY,CAAC,oBAAoB;gBACnF,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE;oBACR,YAAY,EAAE,2EAAuC,CAAC,mBAAmB;iBAC1E;aACF,CAAC,CAAC;YAEH,IAAI,MAAc,CAAC;YACnB,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,GAAG,MAAM,IAAI,CAAC,kCAAkC,CAAC,YAAY,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;YAClG,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC;oBACxD,YAAY,EAAE,YAAY;oBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,QAAQ,EAAE;wBACR,YAAY,EAAE,2EAAuC,CAAC,mBAAmB;qBAC1E;iBACF,CAAC,CAAC;YACL,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,KAAK,CAAC;gBACxD,SAAS,EAAE,eAAe;aAC3B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,QAAQ;IACR,wCAAwC;IACxC,sEAAsE;IACtE,KAAK,CAAC,kCAAkC,CACtC,YAAqC,EACrC,QAAgB,CAAC,EACjB,qBAA6B,GAAG;QAEhC,IAAI,CAAC;YACH,MAAM,aAAa,GAAc,MAAM,IAAI,CAAC,6BAA6B,CACvE,YAAY,EACZ,KAAK,EACL,kBAAkB,CACnB,CAAC;YAEF,MAAM,mBAAmB,GAAW,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC/D,OAAO,EAAE;oBACP,UAAU,GAAG,MAAM,CAAC,QAAQ;oBAC5B,cAAc,GAAG,MAAM,CAAC,QAAQ;oBAChC,aAAa;oBACb,KAAK,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAA;YACrD,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhB,qBAAQ,CAAC,SAAS,CAAC,4BAA4B,EAAE,mBAAmB,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC;gBACtE,YAAY,EAAE,YAAY;gBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE;oBACR,YAAY,EACV,2EAAuC,CAAC,mBAAmB;wBAC3D,2EAAuC,CAAC,YAAY,CAAC,oBAAoB;wBACzE,mBAAmB;iBACtB;aACF,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,gCAAgC,EAAE,KAAK,CAAC;gBACxE,SAAS,EAAE,iBAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,KAAK,CAAC,6BAA6B,CACjC,YAAqC,EACrC,QAAgB,CAAC,EACjB,qBAA6B,GAAG;QAEhC,IAAI,CAAC;YACH,MAAM,WAAW,GAA0B,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAEjF,MAAM,cAAc,GAAW,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC;gBAC3E,YAAY,EAAE,YAAY;gBAC1B,UAAU,EAAE,2EAAuC,CAAC,YAAY,CAAC,iBAAiB;gBAClF,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE;oBACR,YAAY,EACV,2EAAuC,CAAC,mBAAmB;wBAC3D,2EAAuC,CAAC,YAAY,CAAC,YAAY;iBACpE;aACF,CAAC,CAAC;YAEH,qBAAQ,CAAC,QAAQ,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;YAElE,MAAM,aAAa,GAAc,MAAM,IAAI,CAAC,YAAY,CAAC;gBACvD,KAAK,EAAE,cAAc,GAAG,GAAG,GAAG,WAAW,CAAC,OAAO;gBACjD,WAAW,EAAE,gCAAgC;gBAC7C,KAAK,EAAE,KAAK;gBACZ,kBAAkB,EAAE,kBAAkB;aACvC,CAAC,CAAC;YAEH,OAAO,aAAa,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,EAAE,KAAK,CAAC;gBACvE,SAAS,EAAE,iBAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AA5JD,oEA4JC"}
|
|
@@ -3,7 +3,8 @@ 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
9
|
handleMessage(message: Message, issuer: string): Promise<void>;
|
|
9
10
|
}
|
|
@@ -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,IAAI,CAAC;CAqC9E"}
|
|
@@ -16,8 +16,12 @@ class DyNTS_DiAs_IO_ControlService extends discord_bot_1.DyNTS_DiBo_IO_ControlSe
|
|
|
16
16
|
try {
|
|
17
17
|
const messages = await this.mainDiscordBot_CS.gatherMessages(message);
|
|
18
18
|
const oaiMessages = dias_util_1.DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation(messages, this.mainDiscordBot_CS.botClientId, this.mainDiscordBot_CS.botDisplayName);
|
|
19
|
-
const gptResult = await this.llmChat_CS.
|
|
20
|
-
|
|
19
|
+
const gptResult = await this.llmChat_CS.resolveConversationMessage({
|
|
20
|
+
conversation: oaiMessages,
|
|
21
|
+
issuer: issuer,
|
|
22
|
+
settings: {
|
|
23
|
+
systemPrompt: this.mainDiscordBot_CS.defaultSystemPrompt,
|
|
24
|
+
},
|
|
21
25
|
});
|
|
22
26
|
await message.reply(gptResult);
|
|
23
27
|
}
|
|
@@ -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,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjC,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,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,3 +1,3 @@
|
|
|
1
|
-
import { DyNTS_DiBo_Global_Settings } from '../_models/global-
|
|
1
|
+
import { DyNTS_DiBo_Global_Settings } from '../_models/dibo-global-settings.interface';
|
|
2
2
|
export declare const DyNTS_DiBo_global_settings: DyNTS_DiBo_Global_Settings;
|
|
3
3
|
//# sourceMappingURL=dibo-global-settings.conts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-global-settings.conts.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_collections/dibo-global-settings.conts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"dibo-global-settings.conts.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_collections/dibo-global-settings.conts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAOvF,eAAO,MAAM,0BAA0B,EAAE,0BA+CxC,CAAA"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { GatewayIntentBits, Partials } from 'discord.js';
|
|
2
|
+
import { DyNTS_DiBo_Command } from './dibo-command.interface';
|
|
3
|
+
export interface DyNTS_DiBo_Global_Settings {
|
|
4
|
+
/**
|
|
5
|
+
* this setting will set the debug level for the bot
|
|
6
|
+
*
|
|
7
|
+
* 0 - no logs
|
|
8
|
+
* 1 - errors sending to report channel
|
|
9
|
+
* 2 - errors sending as response, will log events in console
|
|
10
|
+
* 3 - errors sending as response, creating reports to report channel, debug events are in console (default)
|
|
11
|
+
* 4 - errors and debug events are sending as response
|
|
12
|
+
* 5 - all events are sending as response (that are set to send)
|
|
13
|
+
* 6 - all debug logs are enabled
|
|
14
|
+
*
|
|
15
|
+
* _
|
|
16
|
+
*/
|
|
17
|
+
debugLevel: number;
|
|
18
|
+
/**
|
|
19
|
+
* this setting will set the intents for the bot
|
|
20
|
+
*/
|
|
21
|
+
intents: GatewayIntentBits[];
|
|
22
|
+
/**
|
|
23
|
+
* this setting will set the partials for the bot
|
|
24
|
+
*/
|
|
25
|
+
partials: Partials[];
|
|
26
|
+
allowedUsers: 'all' | string[];
|
|
27
|
+
messageSettings: {
|
|
28
|
+
/**
|
|
29
|
+
* this setting will set the time limit for message fetching
|
|
30
|
+
* so we will stop fetching messages sent later than this time
|
|
31
|
+
*/
|
|
32
|
+
messageFetchTimeLimit: number;
|
|
33
|
+
/**
|
|
34
|
+
* this setting will set the count limit for message fetching
|
|
35
|
+
* so we will stop fetching messages after this count
|
|
36
|
+
*/
|
|
37
|
+
messageFetchCountLimit: number;
|
|
38
|
+
/**
|
|
39
|
+
* this setting will set the delay for message sending,
|
|
40
|
+
* so we won't flood the channel too fast
|
|
41
|
+
*/
|
|
42
|
+
messageSendDelay: number;
|
|
43
|
+
/**
|
|
44
|
+
* this setting will be used to skip answering to messages
|
|
45
|
+
* if the message contains any of these flags, the bot will not answer
|
|
46
|
+
*
|
|
47
|
+
* @default [ '[BOT-SKIP]' ]
|
|
48
|
+
*/
|
|
49
|
+
skipFlags: string[];
|
|
50
|
+
};
|
|
51
|
+
/**
|
|
52
|
+
* this setting will set the channel settings for the bot
|
|
53
|
+
*/
|
|
54
|
+
channelSettings: {
|
|
55
|
+
/**
|
|
56
|
+
* this setting will set the name of the channel where the bot will send the reports
|
|
57
|
+
*
|
|
58
|
+
* @default 'bot-report'
|
|
59
|
+
*/
|
|
60
|
+
reportChannelName: string;
|
|
61
|
+
/**
|
|
62
|
+
* this setting will set the channels where the bot will answer automatically
|
|
63
|
+
* whenever a message is sent in one of these channels, that is not from the bot
|
|
64
|
+
*
|
|
65
|
+
* it will be populated automatically from the default channels
|
|
66
|
+
*/
|
|
67
|
+
allowedChannels: string[];
|
|
68
|
+
/**
|
|
69
|
+
* this setting will set if the bot can answer in Direct Messages Channels
|
|
70
|
+
*
|
|
71
|
+
* @default false
|
|
72
|
+
*/
|
|
73
|
+
dmIsAllowed: boolean;
|
|
74
|
+
/**
|
|
75
|
+
* this setting will set the default channels where the bot will answer automatically
|
|
76
|
+
* whenever a message is sent in one of these channels, that is not from the bot
|
|
77
|
+
*
|
|
78
|
+
* @default [ 'bot-report' ]
|
|
79
|
+
*/
|
|
80
|
+
defaultChannels: string[];
|
|
81
|
+
};
|
|
82
|
+
commandSettings: {
|
|
83
|
+
commandOperator: string;
|
|
84
|
+
commands: DyNTS_DiBo_Command[];
|
|
85
|
+
};
|
|
86
|
+
allowBotsInteractEachOther: boolean;
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=dibo-global-settings.interface.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dibo-global-settings.interface.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_models/dibo-global-settings.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;;;;;OAYG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAE7B;;OAEG;IACH,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB,YAAY,EAAE,KAAK,GAAG,MAAM,EAAE,CAAC;IAE/B,eAAe,EAAE;QACf;;;WAGG;QACH,qBAAqB,EAAE,MAAM,CAAC;QAC9B;;;WAGG;QACH,sBAAsB,EAAE,MAAM,CAAC;QAC/B;;;WAGG;QACH,gBAAgB,EAAE,MAAM,CAAC;QAEzB;;;;;WAKG;QACH,SAAS,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAEF;;OAEG;IACH,eAAe,EAAE;QACf;;;;WAIG;QACH,iBAAiB,EAAE,MAAM,CAAC;QAE1B;;;;;WAKG;QACH,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B;;;;WAIG;QACH,WAAW,EAAE,OAAO,CAAC;QAErB;;;;;WAKG;QACH,eAAe,EAAE,MAAM,EAAE,CAAC;KAC3B,CAAC;IAEF,eAAe,EAAE;QACf,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,kBAAkB,EAAE,CAAC;KAChC,CAAC;IAEF,0BAA0B,EAAE,OAAO,CAAC;CACrC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dibo-global-settings.interface.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_models/dibo-global-settings.interface.ts"],"names":[],"mappings":""}
|
|
@@ -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,15 +1,16 @@
|
|
|
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
15
|
abstract handleMessage(message: Message, issuer: string): Promise<void>;
|
|
15
16
|
getMessageIsForBotToHandle(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,IAAI,CAAC;IAEjE,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);
|