@futdevpro/nts-dynamo 1.11.20 → 1.11.22
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/_collections/get-environment-settings.util.js +3 -3
- package/build/_collections/get-environment-settings.util.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-commands.control-service.js +1 -1
- 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 +1 -1
- 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 +9 -2
- 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 +1 -1
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js +10 -10
- package/build/_modules/discord-bot/_services/dibo-main.control-service.js.map +1 -1
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.js +1 -1
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.js.map +1 -1
- package/build/_modules/open-ai/_services/oai-chunk.service-base.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-chunk.service-base.js +2 -1
- package/build/_modules/open-ai/_services/oai-chunk.service-base.js.map +1 -1
- package/package.json +1 -1
- package/src/_collections/get-environment-settings.util.ts +3 -3
- package/src/_collections/sample.env +4 -4
- package/src/_modules/discord-bot/_services/dibo-commands.control-service.ts +1 -1
- package/src/_modules/discord-bot/_services/dibo-io.control-service.ts +20 -2
- package/src/_modules/discord-bot/_services/dibo-main.control-service.ts +10 -10
- package/src/_modules/discord-bot/_services/dibo-routines.control-service.ts +1 -1
- package/src/_modules/open-ai/_services/oai-chunk.service-base.ts +4 -2
|
@@ -18,9 +18,9 @@ function DyNTS_getEnvironment_settings() {
|
|
|
18
18
|
fsm_dynamo_1.DyFM_EnvironmentFlag.local,
|
|
19
19
|
discord: {
|
|
20
20
|
guildId: process.env.DISCORD_GUILD_ID,
|
|
21
|
-
token: process.env.
|
|
22
|
-
clientId: process.env.
|
|
23
|
-
oauth2Url: process.env.
|
|
21
|
+
token: process.env.DISCORD_BOT_TOKEN,
|
|
22
|
+
clientId: process.env.DISCORD_BOT_CLIENT_ID,
|
|
23
|
+
oauth2Url: process.env.DISCORD_BOT_OAUTH2_URL,
|
|
24
24
|
},
|
|
25
25
|
mongoUri: process.env.MONGO_URL || process.env.MONGO_URI,
|
|
26
26
|
openAi: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;;;AAAA,sDAAiG;AAEjG,4DAA4B;AAE5B,SAAgB,6BAA6B;IAC3C,gBAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;;;AAAA,sDAAiG;AAEjG,4DAA4B;AAE5B,SAAgB,6BAA6B;IAC3C,gBAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;SAC9C;QAED,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS;QAExD,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YACnC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED;;;;;;;;;aASK;KACN,CAAA;AACH,CAAC;AA5CD,sEA4CC"}
|
|
@@ -11,7 +11,7 @@ class DyNTS_DiBo_Commands_ControlService extends singleton_service_1.DyNTS_Singl
|
|
|
11
11
|
}
|
|
12
12
|
mainDiscordBot_CS = this.getMainDiscordBotControlService();
|
|
13
13
|
get discordServer() {
|
|
14
|
-
return this.mainDiscordBot_CS
|
|
14
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
15
15
|
}
|
|
16
16
|
constructor() {
|
|
17
17
|
super();
|
|
@@ -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,kCAAmC,SAAQ,0CAAsB;IAErF,MAAM,CAAC,WAAW;QAChB,OAAO,kCAAkC,CAAC,oBAAoB,EAAE,CAAC;IACnE,CAAC;IAGkB,iBAAiB,GAClC,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAEzC,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,iBAAiB,
|
|
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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"}
|
|
@@ -13,7 +13,7 @@ export declare abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_Singlet
|
|
|
13
13
|
start(issuer: string): Promise<void>;
|
|
14
14
|
handleNewMessage(message: Message, issuer: string): Promise<void>;
|
|
15
15
|
abstract handleMessage(message: Message, issuer: string): Promise<Message>;
|
|
16
|
-
getMessageIsForBotToHandle(message: Message, issuer: string): Promise<boolean>;
|
|
16
|
+
getMessageIsForBotToHandle(message: Message, issuer: string, dontRemovePing?: boolean): Promise<boolean>;
|
|
17
17
|
handleIfCommand(message: Message, issuer: string): Promise<boolean>;
|
|
18
18
|
isCommand(message: Message, issuer: string): Promise<boolean>;
|
|
19
19
|
}
|
|
@@ -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,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,
|
|
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,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAyHb,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"}
|
|
@@ -8,7 +8,7 @@ const dibo_global_settings_conts_1 = require("../_collections/dibo-global-settin
|
|
|
8
8
|
/* type T_Main_CS = DyNTS_DiBo_Main_ControlService; */
|
|
9
9
|
class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonService {
|
|
10
10
|
get discordServer() {
|
|
11
|
-
return this.mainDiscordBot_CS
|
|
11
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
12
12
|
}
|
|
13
13
|
get botClientId() {
|
|
14
14
|
return this.mainDiscordBot_CS.botClientId;
|
|
@@ -69,8 +69,12 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
|
-
async getMessageIsForBotToHandle(message, issuer) {
|
|
72
|
+
async getMessageIsForBotToHandle(message, issuer, dontRemovePing) {
|
|
73
73
|
try {
|
|
74
|
+
if (!this.discordServer || !this.mainDiscordBot_CS || !this.botClientId) {
|
|
75
|
+
fsm_dynamo_1.DyFM_Log.H_warn('🚫❌ Bot not initialized yet. END wont respond to message:', message.content);
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
74
78
|
const messageIsReplyTo = message.channel.messages.cache.get(message?.reference?.messageId);
|
|
75
79
|
const isReplyForYou = messageIsReplyTo && messageIsReplyTo.author.id === this.botClientId;
|
|
76
80
|
const isPinged = message.content.includes(this.botClientId) ||
|
|
@@ -87,6 +91,9 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
87
91
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
88
92
|
fsm_dynamo_1.DyFM_Log.warn('🚫❌ not allowed channel. END');
|
|
89
93
|
}
|
|
94
|
+
if (!isOwnMessage && isPinged) {
|
|
95
|
+
message.reply(`[SYSTEM|REFUSE|CHANNEL] I'm sorry, but I'm not allowed to answer you in this channel!`);
|
|
96
|
+
}
|
|
90
97
|
return false;
|
|
91
98
|
}
|
|
92
99
|
if (isOwnMessage) {
|
|
@@ -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;IAS/E,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,iBAAiB,
|
|
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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"}
|
|
@@ -17,7 +17,7 @@ import { DyNTS_DiBo_IO_ControlService } from './dibo-io.control-service';
|
|
|
17
17
|
*
|
|
18
18
|
* 3. getting the token
|
|
19
19
|
* - on the same page: "Reset Token" → Copy
|
|
20
|
-
* - put the token in the .env file:
|
|
20
|
+
* - put the token in the .env file: DISCORD_BOT_TOKEN=...
|
|
21
21
|
*
|
|
22
22
|
* 4. Bot ID (Client ID) and Invite link
|
|
23
23
|
* - on the left: "OAuth2" > "URL Generator"
|
|
@@ -23,7 +23,7 @@ const dibo_operations_util_1 = require("../_collections/dibo-operations.util");
|
|
|
23
23
|
*
|
|
24
24
|
* 3. getting the token
|
|
25
25
|
* - on the same page: "Reset Token" → Copy
|
|
26
|
-
* - put the token in the .env file:
|
|
26
|
+
* - put the token in the .env file: DISCORD_BOT_TOKEN=...
|
|
27
27
|
*
|
|
28
28
|
* 4. Bot ID (Client ID) and Invite link
|
|
29
29
|
* - on the left: "OAuth2" > "URL Generator"
|
|
@@ -52,10 +52,10 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
52
52
|
return this._discordServer;
|
|
53
53
|
}
|
|
54
54
|
get botClientId() {
|
|
55
|
-
return this.client
|
|
55
|
+
return this.client?.user?.id ?? global_settings_const_1.DyNTS_global_settings?.env_settings?.discord?.clientId;
|
|
56
56
|
}
|
|
57
57
|
get botDisplayName() {
|
|
58
|
-
return this.client
|
|
58
|
+
return this.client?.user?.displayName;
|
|
59
59
|
}
|
|
60
60
|
botIO_CS;
|
|
61
61
|
routines_CS;
|
|
@@ -84,25 +84,25 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
84
84
|
throw new Error(`No discord server id found!` +
|
|
85
85
|
`\nPlease set the DISCORD_GUILD_ID in the .env file, ` +
|
|
86
86
|
`or directly in the DyNTS_global_settings.env_settings.discord.guildId` +
|
|
87
|
-
`\nYou also will need to set the
|
|
87
|
+
`\nYou also will need to set the DISCORD_BOT_TOKEN, DISCORD_BOT_CLIENT_ID and DISCORD_BOT_OAUTH2_URL.`);
|
|
88
88
|
}
|
|
89
89
|
if (!global_settings_const_1.DyNTS_global_settings.env_settings.discord.token) {
|
|
90
90
|
throw new Error(`No discord token found!` +
|
|
91
|
-
`\nPlease set the
|
|
91
|
+
`\nPlease set the DISCORD_BOT_TOKEN in the .env file, ` +
|
|
92
92
|
`or directly in the DyNTS_global_settings.env_settings.discord.token` +
|
|
93
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
93
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_CLIENT_ID and DISCORD_BOT_OAUTH2_URL.`);
|
|
94
94
|
}
|
|
95
95
|
if (!global_settings_const_1.DyNTS_global_settings.env_settings.discord.clientId) {
|
|
96
96
|
throw new Error(`No discord client id found!` +
|
|
97
|
-
`\nPlease set the
|
|
97
|
+
`\nPlease set the DISCORD_BOT_CLIENT_ID in the .env file, ` +
|
|
98
98
|
`or directly in the DyNTS_global_settings.env_settings.discord.clientId` +
|
|
99
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
99
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_TOKEN and DISCORD_BOT_OAUTH2_URL.`);
|
|
100
100
|
}
|
|
101
101
|
if (!global_settings_const_1.DyNTS_global_settings.env_settings.discord.oauth2Url) {
|
|
102
102
|
throw new Error(`No discord oauth2 url found!` +
|
|
103
|
-
`\nPlease set the
|
|
103
|
+
`\nPlease set the DISCORD_BOT_OAUTH2_URL in the .env file, ` +
|
|
104
104
|
`or directly in the DyNTS_global_settings.env_settings.discord.oauth2Url` +
|
|
105
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
105
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_TOKEN and DISCORD_BOT_CLIENT_ID.`);
|
|
106
106
|
}
|
|
107
107
|
dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.defaultChannels.forEach(channelName => {
|
|
108
108
|
if (!dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.allowedChannels.includes(channelName)) {
|
|
@@ -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,
|
|
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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"}
|
|
@@ -7,7 +7,7 @@ const global_settings_const_1 = require("../../../_collections/global-settings.c
|
|
|
7
7
|
class DyNTS_DiBo_Routines_ControlService extends singleton_service_1.DyNTS_SingletonService {
|
|
8
8
|
mainDiscordBot_CS = this.getMainDiscordBotControlService();
|
|
9
9
|
get discordServer() {
|
|
10
|
-
return this.mainDiscordBot_CS
|
|
10
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
11
11
|
}
|
|
12
12
|
constructor() {
|
|
13
13
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dibo-routines.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-routines.control-service.ts"],"names":[],"mappings":";;;AAIA,sDAAkF;AAClF,iFAAmF;AAEnF,uFAAoF;AAEpF,MAAsB,kCAAmC,SAAQ,0CAAsB;IAQlE,iBAAiB,GAClC,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAEzC,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"dibo-routines.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/discord-bot/_services/dibo-routines.control-service.ts"],"names":[],"mappings":";;;AAIA,sDAAkF;AAClF,iFAAmF;AAEnF,uFAAoF;AAEpF,MAAsB,kCAAmC,SAAQ,0CAAsB;IAQlE,iBAAiB,GAClC,IAAI,CAAC,+BAA+B,EAAE,CAAC;IAEzC,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC;IAC/C,CAAC;IAED;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,aAAa,EACb,IAAI,KAAK,CACP,sCAAsC;oBACtC,6DAA6D,CAC9D,EACD,aAAa,CACd;gBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,sBAAsB;aAC9E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC;gBACvD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,qBAAqB;aAC7E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;CAGF;AA7CD,gFA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunk.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,qBAAqB,
|
|
1
|
+
{"version":3,"file":"oai-chunk.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,qBAAqB,EAAoG,MAAM,uBAAuB,CAAC;AAC5K,OAAO,EAAE,oBAAoB,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0DAA0D,CAAC;AAExG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,yDAAyD,CAAC;AAGtG,qBAAa,+BAA+B,CAC1C,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,sBAAsB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAChF,SAAQ,2BAA2B,CAAC,OAAO,CAAC;IAEnC,QAAQ,EAAE,OAAO,CAAQ;gBAGhC,UAAU,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAC1C,cAAc,EAAE,oBAAoB,EACpC,MAAM,EAAE,MAAM;IAUV,UAAU,CACd,iBAAiB,EAAE,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,EAC/D,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAwDV,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IA+EhG,aAAa,CACjB,MAAM,EAAE,OAAO,EAAE,EACjB,SAAS,CAAC,EAAE,OAAO,EAAE,GACpB,OAAO,CAAC,4BAA4B,CAAC,OAAO,CAAC,EAAE,CAAC;IAkC7C,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;CA2ClD"}
|
|
@@ -38,7 +38,8 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
|
|
|
38
38
|
fsm_dynamo_1.DyFM_Log.H_info(`✅ saving Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
|
|
39
39
|
chunk: chunk,
|
|
40
40
|
});
|
|
41
|
-
|
|
41
|
+
/* DyFM_Log.H_warn(`STOP`);
|
|
42
|
+
await DyFM_wait(10_000 * minute); */
|
|
42
43
|
}
|
|
43
44
|
await this.saveData(chunk, false, true);
|
|
44
45
|
fsm_dynamo_1.DyFM_Log.info(`✅ Chunk saved: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -21,9 +21,9 @@ export function DyNTS_getEnvironment_settings(): DyNTS_Environment_Settings {
|
|
|
21
21
|
|
|
22
22
|
discord: {
|
|
23
23
|
guildId: process.env.DISCORD_GUILD_ID,
|
|
24
|
-
token: process.env.
|
|
25
|
-
clientId: process.env.
|
|
26
|
-
oauth2Url: process.env.
|
|
24
|
+
token: process.env.DISCORD_BOT_TOKEN,
|
|
25
|
+
clientId: process.env.DISCORD_BOT_CLIENT_ID,
|
|
26
|
+
oauth2Url: process.env.DISCORD_BOT_OAUTH2_URL,
|
|
27
27
|
},
|
|
28
28
|
|
|
29
29
|
mongoUri: process.env.MONGO_URL || process.env.MONGO_URI,
|
|
@@ -4,10 +4,10 @@ ENV={REPLACE_ENV}
|
|
|
4
4
|
|
|
5
5
|
MONGO_URL={REPLACE_ATLASDB_URI}
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
DISCORD_BOT_TOKEN={REPLACE_DISCORD_BOT_TOKEN}
|
|
8
|
+
DISCORD_BOT_CLIENT_ID={REPLACE_DISCORD_BOT_CLIENT_ID}
|
|
9
9
|
DISCORD_GUILD_ID={REPLACE_DISCORD_GUILD_ID}
|
|
10
|
-
|
|
10
|
+
DISCORD_BOT_OAUTH2_URL={REPLACE_DISCORD_BOT_OAUTH2_URL}
|
|
11
11
|
|
|
12
12
|
OPENAI_API_KEY={REPLACE_OPENAI_API_KEY}
|
|
13
13
|
OPENAI_ORGANIZATION={REPLACE_OPENAI_ORGANIZATION}
|
|
@@ -16,6 +16,6 @@ OPENAI_TTS_API_KEY={REPLACE_OPENAI_TTS_API_KEY}
|
|
|
16
16
|
|
|
17
17
|
ELEVENLABS_API_KEY={REPLACE_ELEVENLABS_API_KEY}
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
CLICKUP_API_KEY={REPLACE_CLICKUP_API_KEY}
|
|
20
20
|
CLICKUP_WORKSPACE_ID={REPLACE_CLICKUP_WORKSPACE_ID}
|
|
21
21
|
CLICKUP_SPACE_ID={REPLACE_CLICKUP_SPACE_ID}
|
|
@@ -20,7 +20,7 @@ export abstract class DyNTS_DiBo_Commands_ControlService extends DyNTS_Singleton
|
|
|
20
20
|
this.getMainDiscordBotControlService();
|
|
21
21
|
|
|
22
22
|
get discordServer(): Guild {
|
|
23
|
-
return this.mainDiscordBot_CS
|
|
23
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
protected constructor() {
|
|
@@ -20,7 +20,7 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
20
20
|
protected abstract mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService;
|
|
21
21
|
|
|
22
22
|
get discordServer(): Guild {
|
|
23
|
-
return this.mainDiscordBot_CS
|
|
23
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
24
24
|
}
|
|
25
25
|
get botClientId(): string {
|
|
26
26
|
return this.mainDiscordBot_CS.botClientId;
|
|
@@ -104,8 +104,20 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
104
104
|
|
|
105
105
|
abstract handleMessage(message: Message, issuer: string): Promise<Message>;
|
|
106
106
|
|
|
107
|
-
async getMessageIsForBotToHandle(
|
|
107
|
+
async getMessageIsForBotToHandle(
|
|
108
|
+
message: Message,
|
|
109
|
+
issuer: string,
|
|
110
|
+
dontRemovePing?: boolean
|
|
111
|
+
): Promise<boolean> {
|
|
108
112
|
try {
|
|
113
|
+
if (!this.discordServer || !this.mainDiscordBot_CS || !this.botClientId) {
|
|
114
|
+
DyFM_Log.H_warn(
|
|
115
|
+
'🚫❌ Bot not initialized yet. END wont respond to message:', message.content
|
|
116
|
+
)
|
|
117
|
+
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
|
|
109
121
|
const messageIsReplyTo: Message = message.channel.messages.cache.get(
|
|
110
122
|
message?.reference?.messageId
|
|
111
123
|
);
|
|
@@ -132,6 +144,12 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
|
|
|
132
144
|
DyFM_Log.warn('🚫❌ not allowed channel. END')
|
|
133
145
|
}
|
|
134
146
|
|
|
147
|
+
if (!isOwnMessage && isPinged) {
|
|
148
|
+
message.reply(
|
|
149
|
+
`[SYSTEM|REFUSE|CHANNEL] I'm sorry, but I'm not allowed to answer you in this channel!`
|
|
150
|
+
)
|
|
151
|
+
}
|
|
152
|
+
|
|
135
153
|
return false;
|
|
136
154
|
}
|
|
137
155
|
|
|
@@ -25,7 +25,7 @@ import { DyNTS_DiBo_Operations_Util } from '../_collections/dibo-operations.util
|
|
|
25
25
|
*
|
|
26
26
|
* 3. getting the token
|
|
27
27
|
* - on the same page: "Reset Token" → Copy
|
|
28
|
-
* - put the token in the .env file:
|
|
28
|
+
* - put the token in the .env file: DISCORD_BOT_TOKEN=...
|
|
29
29
|
*
|
|
30
30
|
* 4. Bot ID (Client ID) and Invite link
|
|
31
31
|
* - on the left: "OAuth2" > "URL Generator"
|
|
@@ -58,10 +58,10 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
|
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
get botClientId(): string {
|
|
61
|
-
return this.client
|
|
61
|
+
return this.client?.user?.id ?? DyNTS_global_settings?.env_settings?.discord?.clientId;
|
|
62
62
|
}
|
|
63
63
|
get botDisplayName(): string {
|
|
64
|
-
return this.client
|
|
64
|
+
return this.client?.user?.displayName;
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
protected botIO_CS: DyNTS_DiBo_IO_ControlService;
|
|
@@ -113,34 +113,34 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
|
|
|
113
113
|
`No discord server id found!` +
|
|
114
114
|
`\nPlease set the DISCORD_GUILD_ID in the .env file, ` +
|
|
115
115
|
`or directly in the DyNTS_global_settings.env_settings.discord.guildId` +
|
|
116
|
-
`\nYou also will need to set the
|
|
116
|
+
`\nYou also will need to set the DISCORD_BOT_TOKEN, DISCORD_BOT_CLIENT_ID and DISCORD_BOT_OAUTH2_URL.`
|
|
117
117
|
);
|
|
118
118
|
}
|
|
119
119
|
|
|
120
120
|
if (!DyNTS_global_settings.env_settings.discord.token) {
|
|
121
121
|
throw new Error(
|
|
122
122
|
`No discord token found!` +
|
|
123
|
-
`\nPlease set the
|
|
123
|
+
`\nPlease set the DISCORD_BOT_TOKEN in the .env file, ` +
|
|
124
124
|
`or directly in the DyNTS_global_settings.env_settings.discord.token` +
|
|
125
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
125
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_CLIENT_ID and DISCORD_BOT_OAUTH2_URL.`
|
|
126
126
|
);
|
|
127
127
|
}
|
|
128
128
|
|
|
129
129
|
if (!DyNTS_global_settings.env_settings.discord.clientId) {
|
|
130
130
|
throw new Error(
|
|
131
131
|
`No discord client id found!` +
|
|
132
|
-
`\nPlease set the
|
|
132
|
+
`\nPlease set the DISCORD_BOT_CLIENT_ID in the .env file, ` +
|
|
133
133
|
`or directly in the DyNTS_global_settings.env_settings.discord.clientId` +
|
|
134
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
134
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_TOKEN and DISCORD_BOT_OAUTH2_URL.`
|
|
135
135
|
);
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
if (!DyNTS_global_settings.env_settings.discord.oauth2Url) {
|
|
139
139
|
throw new Error(
|
|
140
140
|
`No discord oauth2 url found!` +
|
|
141
|
-
`\nPlease set the
|
|
141
|
+
`\nPlease set the DISCORD_BOT_OAUTH2_URL in the .env file, ` +
|
|
142
142
|
`or directly in the DyNTS_global_settings.env_settings.discord.oauth2Url` +
|
|
143
|
-
`\nYou also will need to set the DISCORD_GUILD_ID,
|
|
143
|
+
`\nYou also will need to set the DISCORD_GUILD_ID, DISCORD_BOT_TOKEN and DISCORD_BOT_CLIENT_ID.`
|
|
144
144
|
);
|
|
145
145
|
}
|
|
146
146
|
|
|
@@ -19,7 +19,7 @@ export abstract class DyNTS_DiBo_Routines_ControlService extends DyNTS_Singleton
|
|
|
19
19
|
this.getMainDiscordBotControlService();
|
|
20
20
|
|
|
21
21
|
get discordServer(): Guild {
|
|
22
|
-
return this.mainDiscordBot_CS
|
|
22
|
+
return this.mainDiscordBot_CS?.discordServer;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
protected constructor() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DyFM_Array, DyFM_DataModel_Params, DyFM_DataProperties, DyFM_DBFilterSimple, DyFM_Error, DyFM_Log, DyFM_Metadata, DyFM_wait } from '@futdevpro/fsm-dynamo';
|
|
1
|
+
import { DyFM_Array, DyFM_DataModel_Params, DyFM_DataProperties, DyFM_DBFilterSimple, DyFM_Error, DyFM_Log, DyFM_Metadata, DyFM_wait, minute } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { DyFM_OpenAI_Settings, DyFM_OpenAIModel } from '@futdevpro/fsm-dynamo/open-ai';
|
|
3
3
|
import { DyNTS_OAI_VectorDataService } from './oai-vector-data.service';
|
|
4
4
|
import { DyNTS_OAI_Chunking_Util } from '../_collections/oai-chunking.util';
|
|
@@ -68,7 +68,9 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
|
|
|
68
68
|
DyFM_Log.H_info(`✅ saving Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
|
|
69
69
|
chunk: chunk,
|
|
70
70
|
});
|
|
71
|
-
|
|
71
|
+
|
|
72
|
+
/* DyFM_Log.H_warn(`STOP`);
|
|
73
|
+
await DyFM_wait(10_000 * minute); */
|
|
72
74
|
}
|
|
73
75
|
|
|
74
76
|
await this.saveData(chunk, false, true);
|