@futdevpro/nts-dynamo 1.11.22 → 1.11.24
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/archive.util.js +2 -2
- package/build/_collections/archive.util.js.map +1 -1
- package/build/_collections/atlas-default-db-options.const.d.ts +0 -25
- package/build/_collections/atlas-default-db-options.const.d.ts.map +1 -1
- package/build/_collections/get-environment-settings.util.js +1 -2
- package/build/_collections/get-environment-settings.util.js.map +1 -1
- package/build/_models/control-models/app-params.control-model.d.ts +0 -25
- package/build/_models/control-models/app-params.control-model.d.ts.map +1 -1
- package/build/_models/interfaces/certification-settings.interface.d.ts +0 -1
- package/build/_models/interfaces/certification-settings.interface.d.ts.map +1 -1
- package/build/_modules/custom-data/get-custom-data-routing-module.util.js +1 -2
- package/build/_modules/custom-data/get-custom-data-routing-module.util.js.map +1 -1
- package/build/_modules/discord-assistant/_collections/dias.util.d.ts +19 -3
- package/build/_modules/discord-assistant/_collections/dias.util.d.ts.map +1 -1
- package/build/_modules/discord-assistant/_collections/dias.util.js +19 -15
- package/build/_modules/discord-assistant/_collections/dias.util.js.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.service-base.d.ts +3 -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 +10 -1
- package/build/_modules/discord-assistant/_services/dias.service-base.js.map +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 +6 -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 +4 -2
- 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 +60 -2
- 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 +2 -0
- 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 +5 -0
- package/build/_modules/discord-bot/_services/dibo-routines.control-service.js.map +1 -1
- package/build/_modules/mock/auth-service.mock.d.ts.map +1 -1
- package/build/_modules/oauth2/_services/oauth2.auth-service.d.ts.map +1 -1
- package/build/_modules/open-ai/_collections/oai-global-settings.const.js +1 -1
- package/build/_modules/open-ai/_collections/oai-global-settings.const.js.map +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.service-base.d.ts.map +1 -1
- package/build/_modules/open-ai/_services/oai-llm.service-base.js +4 -4
- package/build/_modules/open-ai/_services/oai-llm.service-base.js.map +1 -1
- package/build/_modules/test/get-test-routing-module.util.js +1 -2
- package/build/_modules/test/get-test-routing-module.util.js.map +1 -1
- package/build/_modules/usage/get-usage-routing-module.util.js +1 -2
- package/build/_modules/usage/get-usage-routing-module.util.js.map +1 -1
- package/build/_services/base/db.service.d.ts.map +1 -1
- package/build/_services/server/app.server.d.ts +0 -27
- package/build/_services/server/app.server.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/_modules/discord-assistant/_collections/dias.util.ts +37 -28
- package/src/_modules/discord-assistant/_services/dias-io.control-service.ts +6 -6
- package/src/_modules/discord-assistant/_services/dias.service-base.ts +16 -1
- package/src/_modules/discord-bot/_services/dibo-io.control-service.ts +14 -4
- package/src/_modules/discord-bot/_services/dibo-main.control-service.ts +90 -2
- package/src/_modules/discord-bot/_services/dibo-routines.control-service.ts +7 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DyNTS_archiveSuffix = void 0;
|
|
4
|
+
exports.DyNTS_getArchivedDBName = DyNTS_getArchivedDBName;
|
|
4
5
|
/** Suffix appended to database names when archived. */
|
|
5
6
|
exports.DyNTS_archiveSuffix = 'archived';
|
|
6
7
|
/**
|
|
@@ -15,5 +16,4 @@ exports.DyNTS_archiveSuffix = 'archived';
|
|
|
15
16
|
function DyNTS_getArchivedDBName(dbName) {
|
|
16
17
|
return `${dbName}_${exports.DyNTS_archiveSuffix}`;
|
|
17
18
|
}
|
|
18
|
-
exports.DyNTS_getArchivedDBName = DyNTS_getArchivedDBName;
|
|
19
19
|
//# sourceMappingURL=archive.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.util.js","sourceRoot":"","sources":["../../src/_collections/archive.util.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"archive.util.js","sourceRoot":"","sources":["../../src/_collections/archive.util.ts"],"names":[],"mappings":";;;AAcA,0DAEC;AAdD,uDAAuD;AAC1C,QAAA,mBAAmB,GAAG,UAAU,CAAC;AAE9C;;;;;;;;GAQG;AACH,SAAgB,uBAAuB,CAAC,MAAc;IACpD,OAAO,GAAG,MAAM,IAAI,2BAAmB,EAAE,CAAC;AAC5C,CAAC"}
|
|
@@ -1,28 +1,3 @@
|
|
|
1
|
-
/// <reference types="mongoose/types/aggregate" />
|
|
2
|
-
/// <reference types="mongoose/types/callback" />
|
|
3
|
-
/// <reference types="mongoose/types/collection" />
|
|
4
|
-
/// <reference types="mongoose/types/connection" />
|
|
5
|
-
/// <reference types="mongoose/types/cursor" />
|
|
6
|
-
/// <reference types="mongoose/types/document" />
|
|
7
|
-
/// <reference types="mongoose/types/error" />
|
|
8
|
-
/// <reference types="mongoose/types/expressions" />
|
|
9
|
-
/// <reference types="mongoose/types/helpers" />
|
|
10
|
-
/// <reference types="mongoose/types/middlewares" />
|
|
11
|
-
/// <reference types="mongoose/types/indexes" />
|
|
12
|
-
/// <reference types="mongoose/types/models" />
|
|
13
|
-
/// <reference types="mongoose/types/mongooseoptions" />
|
|
14
|
-
/// <reference types="mongoose/types/pipelinestage" />
|
|
15
|
-
/// <reference types="mongoose/types/populate" />
|
|
16
|
-
/// <reference types="mongoose/types/query" />
|
|
17
|
-
/// <reference types="mongoose/types/schemaoptions" />
|
|
18
|
-
/// <reference types="mongoose/types/schematypes" />
|
|
19
|
-
/// <reference types="mongoose/types/session" />
|
|
20
|
-
/// <reference types="mongoose/types/types" />
|
|
21
|
-
/// <reference types="mongoose/types/utility" />
|
|
22
|
-
/// <reference types="mongoose/types/validation" />
|
|
23
|
-
/// <reference types="mongoose/types/virtuals" />
|
|
24
|
-
/// <reference types="mongoose/types/inferschematype" />
|
|
25
|
-
/// <reference types="mongoose/types/inferrawdoctype" />
|
|
26
1
|
import { ConnectOptions } from 'mongoose';
|
|
27
2
|
export declare const DyNTS_atlasDefaultDbOptions: ConnectOptions;
|
|
28
3
|
//# sourceMappingURL=atlas-default-db-options.const.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atlas-default-db-options.const.d.ts","sourceRoot":"","sources":["../../src/_collections/atlas-default-db-options.const.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"atlas-default-db-options.const.d.ts","sourceRoot":"","sources":["../../src/_collections/atlas-default-db-options.const.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,eAAO,MAAM,2BAA2B,EAAE,cAIzC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DyNTS_getEnvironment_settings =
|
|
3
|
+
exports.DyNTS_getEnvironment_settings = DyNTS_getEnvironment_settings;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
6
|
const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
|
|
@@ -41,5 +41,4 @@ function DyNTS_getEnvironment_settings() {
|
|
|
41
41
|
}, */
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
exports.DyNTS_getEnvironment_settings = DyNTS_getEnvironment_settings;
|
|
45
44
|
//# sourceMappingURL=get-environment-settings.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;AAIA,sEA4CC;;AAhDD,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"}
|
|
@@ -1,28 +1,3 @@
|
|
|
1
|
-
/// <reference types="mongoose/types/aggregate" />
|
|
2
|
-
/// <reference types="mongoose/types/callback" />
|
|
3
|
-
/// <reference types="mongoose/types/collection" />
|
|
4
|
-
/// <reference types="mongoose/types/connection" />
|
|
5
|
-
/// <reference types="mongoose/types/cursor" />
|
|
6
|
-
/// <reference types="mongoose/types/document" />
|
|
7
|
-
/// <reference types="mongoose/types/error" />
|
|
8
|
-
/// <reference types="mongoose/types/expressions" />
|
|
9
|
-
/// <reference types="mongoose/types/helpers" />
|
|
10
|
-
/// <reference types="mongoose/types/middlewares" />
|
|
11
|
-
/// <reference types="mongoose/types/indexes" />
|
|
12
|
-
/// <reference types="mongoose/types/models" />
|
|
13
|
-
/// <reference types="mongoose/types/mongooseoptions" />
|
|
14
|
-
/// <reference types="mongoose/types/pipelinestage" />
|
|
15
|
-
/// <reference types="mongoose/types/populate" />
|
|
16
|
-
/// <reference types="mongoose/types/query" />
|
|
17
|
-
/// <reference types="mongoose/types/schemaoptions" />
|
|
18
|
-
/// <reference types="mongoose/types/schematypes" />
|
|
19
|
-
/// <reference types="mongoose/types/session" />
|
|
20
|
-
/// <reference types="mongoose/types/types" />
|
|
21
|
-
/// <reference types="mongoose/types/utility" />
|
|
22
|
-
/// <reference types="mongoose/types/validation" />
|
|
23
|
-
/// <reference types="mongoose/types/virtuals" />
|
|
24
|
-
/// <reference types="mongoose/types/inferschematype" />
|
|
25
|
-
/// <reference types="mongoose/types/inferrawdoctype" />
|
|
26
1
|
import { ConnectOptions } from 'mongoose';
|
|
27
2
|
/**
|
|
28
3
|
* This will hold and set the basic settings of an application
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/app-params.control-model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/app-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAEpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;;;SAIK;IACL,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,CAAC;gBAGjD,GAAG,EAAE,gBAAgB;CAgExB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"certification-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/certification-settings.interface.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"certification-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/certification-settings.interface.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,IAAI,CAAC;AAEjC,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC;IAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;CAC/B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DyNTS_getCustomDataRoutingModule =
|
|
3
|
+
exports.DyNTS_getCustomDataRoutingModule = DyNTS_getCustomDataRoutingModule;
|
|
4
4
|
const custom_data_1 = require("@futdevpro/fsm-dynamo/custom-data");
|
|
5
5
|
const routing_module_service_1 = require("../../_services/route/routing-module.service");
|
|
6
6
|
const custom_data_controller_1 = require("./custom-data.controller");
|
|
@@ -14,5 +14,4 @@ function DyNTS_getCustomDataRoutingModule(securityOverride) {
|
|
|
14
14
|
}
|
|
15
15
|
return new routing_module_service_1.DyNTS_RoutingModule(set);
|
|
16
16
|
}
|
|
17
|
-
exports.DyNTS_getCustomDataRoutingModule = DyNTS_getCustomDataRoutingModule;
|
|
18
17
|
//# sourceMappingURL=get-custom-data-routing-module.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-custom-data-routing-module.util.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/get-custom-data-routing-module.util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-custom-data-routing-module.util.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/get-custom-data-routing-module.util.ts"],"names":[],"mappings":";;AAUA,4EAaC;AAtBD,mEAAmF;AAMnF,yFAAmF;AACnF,qEAAuE;AAEvE,SAAgB,gCAAgC,CAC9C,gBAAsC;IAEtC,MAAM,GAAG,GAAiC;QACxC,KAAK,EAAE,4CAA8B,CAAC,SAAS;QAC/C,WAAW,EAAE,CAAE,oDAA2B,CAAC,WAAW,EAAE,CAAE;KAC3D,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,GAAG,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,4CAAmB,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1,14 +1,30 @@
|
|
|
1
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
|
-
static convertDiscordMessagesToOAIConversation(
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
static convertDiscordMessagesToOAIConversation(set: {
|
|
5
|
+
messages: Message[];
|
|
6
|
+
botClientId: string;
|
|
7
|
+
botDisplayName: string;
|
|
8
|
+
}): DyNTS_OAI_GPT_Message[];
|
|
9
|
+
static gatherMessagesAsOAIConversation(set: {
|
|
10
|
+
message: Message;
|
|
11
|
+
botClientId: string;
|
|
12
|
+
botDisplayName: string;
|
|
13
|
+
issuer: string;
|
|
14
|
+
skipFlags?: string[];
|
|
15
|
+
}): Promise<DyNTS_OAI_GPT_Message[]>;
|
|
16
|
+
static gatherMessagesForMessage(set: {
|
|
17
|
+
message: Message;
|
|
18
|
+
botClientId: string;
|
|
19
|
+
issuer: string;
|
|
20
|
+
skipFlags?: string[];
|
|
21
|
+
}): Promise<Message[]>;
|
|
7
22
|
static gatherMessages(set: {
|
|
8
23
|
channel: TextChannel;
|
|
9
24
|
userId: string;
|
|
10
25
|
botClientId: string;
|
|
11
26
|
skipFlags?: string[];
|
|
27
|
+
limit?: number;
|
|
12
28
|
issuer: string;
|
|
13
29
|
}): Promise<Message[]>;
|
|
14
30
|
}
|
|
@@ -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,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,
|
|
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,GAAG,EAAE;QACH,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;KACxB,GACA,qBAAqB,EAAE;WA+Bb,+BAA+B,CAC1C,GAAG,EAAE;QACH,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACtB,GACA,OAAO,CAAC,qBAAqB,EAAE,CAAC;WAUtB,wBAAwB,CACnC,GAAG,EAAE;QACH,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACtB,GACA,OAAO,CAAC,OAAO,EAAE,CAAC;WAcR,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,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,OAAO,EAAE,CAAC;CAkCtB"}
|
|
@@ -5,12 +5,12 @@ const dias_global_settings_const_1 = require("./dias-global-settings.const");
|
|
|
5
5
|
const open_ai_1 = require("../../open-ai");
|
|
6
6
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
7
7
|
class DyNTS_DiAs_Util {
|
|
8
|
-
static convertDiscordMessagesToOAIConversation(
|
|
9
|
-
return messages.map(message => {
|
|
8
|
+
static convertDiscordMessagesToOAIConversation(set) {
|
|
9
|
+
return set.messages.map(message => {
|
|
10
10
|
if ((message?.author &&
|
|
11
11
|
(message.author.bot ||
|
|
12
|
-
message.author.id === botClientId ||
|
|
13
|
-
message.author.displayName === botDisplayName))) {
|
|
12
|
+
message.author.id === set.botClientId ||
|
|
13
|
+
message.author.displayName === set.botDisplayName))) {
|
|
14
14
|
if (dias_global_settings_const_1.DyNTS_DiAs_global_settings.userTranslationFlags.some(flag => message.content.includes(flag))) {
|
|
15
15
|
return {
|
|
16
16
|
role: open_ai_1.DyNTS_OAI_GPT_Message_Role.user,
|
|
@@ -32,20 +32,24 @@ class DyNTS_DiAs_Util {
|
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
static async gatherMessagesAsOAIConversation(
|
|
36
|
-
const messages = await this.gatherMessagesForMessage(message, botClientId, issuer, skipFlags);
|
|
37
|
-
return DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation(
|
|
35
|
+
static async gatherMessagesAsOAIConversation(set) {
|
|
36
|
+
const messages = await this.gatherMessagesForMessage(set /* message, botClientId, issuer, skipFlags */);
|
|
37
|
+
return DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation({
|
|
38
|
+
messages: messages,
|
|
39
|
+
botClientId: set.botClientId,
|
|
40
|
+
botDisplayName: set.botDisplayName,
|
|
41
|
+
});
|
|
38
42
|
}
|
|
39
|
-
static async gatherMessagesForMessage(
|
|
40
|
-
if (!message.channel.isTextBased()) {
|
|
43
|
+
static async gatherMessagesForMessage(set) {
|
|
44
|
+
if (!set.message.channel.isTextBased()) {
|
|
41
45
|
throw new Error('Message channel is not a text channel!');
|
|
42
46
|
}
|
|
43
47
|
return this.gatherMessages({
|
|
44
|
-
channel: message.channel,
|
|
45
|
-
userId: message.author.id,
|
|
46
|
-
botClientId: botClientId,
|
|
47
|
-
skipFlags: skipFlags,
|
|
48
|
-
issuer: issuer,
|
|
48
|
+
channel: set.message.channel,
|
|
49
|
+
userId: set.message.author.id,
|
|
50
|
+
botClientId: set.botClientId,
|
|
51
|
+
skipFlags: set.skipFlags,
|
|
52
|
+
issuer: set.issuer,
|
|
49
53
|
});
|
|
50
54
|
}
|
|
51
55
|
static async gatherMessages(set) {
|
|
@@ -54,7 +58,7 @@ class DyNTS_DiAs_Util {
|
|
|
54
58
|
throw new Error('Message channel is not a text channel!');
|
|
55
59
|
}
|
|
56
60
|
const messages = await set.channel.messages.fetch({
|
|
57
|
-
limit: 100,
|
|
61
|
+
limit: set.limit ?? 100,
|
|
58
62
|
}).then(messages => {
|
|
59
63
|
if (set.skipFlags) {
|
|
60
64
|
messages = messages.filter(msg => !set.skipFlags.some(flag => msg.content.includes(flag)));
|
|
@@ -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;AAC3D,sDAAmD;AAGnD,MAAa,eAAe;IAE1B,MAAM,CAAC,uCAAuC,CAC5C,
|
|
1
|
+
{"version":3,"file":"dias.util.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_collections/dias.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,12 @@ class DyNTS_DiAs_IO_ControlService extends discord_bot_1.DyNTS_DiBo_IO_ControlSe
|
|
|
14
14
|
}
|
|
15
15
|
async handleMessage(message, issuer) {
|
|
16
16
|
try {
|
|
17
|
-
const messages = await this.mainDiscordBot_CS.
|
|
18
|
-
const oaiMessages = dias_util_1.DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation(
|
|
17
|
+
const messages = await this.mainDiscordBot_CS.gatherDiscordMessagesForMessage(message);
|
|
18
|
+
const oaiMessages = dias_util_1.DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation({
|
|
19
|
+
messages: messages,
|
|
20
|
+
botClientId: this.mainDiscordBot_CS.botClientId,
|
|
21
|
+
botDisplayName: this.mainDiscordBot_CS.botDisplayName,
|
|
22
|
+
});
|
|
19
23
|
const gptResult = await this.llmChat_CS.resolveConversationMessage({
|
|
20
24
|
conversation: oaiMessages,
|
|
21
25
|
issuer: issuer,
|
|
@@ -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;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,
|
|
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,+BAA+B,CAAC,OAAO,CAAC,CAAC;YAClG,MAAM,WAAW,GACf,2BAAe,CAAC,uCAAuC,CAAC;gBACtD,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW;gBAC/C,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,cAAc;aACtD,CAAC,CAAC;YAEL,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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { Message } from 'discord.js';
|
|
2
2
|
import { DyNTS_DiBo_Main_ControlService } from '../../discord-bot/_services/dibo-main.control-service';
|
|
3
3
|
import { DyNTS_OAI_LLMChat_ServiceBase } from '../../open-ai/_services/oai-llm-chat.service-base';
|
|
4
|
+
import { DyNTS_OAI_GPT_Message } from '../../open-ai/_models/interfaces/oai-gpt-message.interface';
|
|
4
5
|
export declare abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_ControlService {
|
|
5
6
|
getLLMChatControlService(): DyNTS_OAI_LLMChat_ServiceBase;
|
|
6
7
|
readonly llmChat_CS: DyNTS_OAI_LLMChat_ServiceBase;
|
|
7
8
|
defaultSystemPrompt: string;
|
|
8
9
|
protected constructor();
|
|
9
|
-
|
|
10
|
+
gatherDiscordMessagesForMessage(message: Message, limit?: number): Promise<Message[]>;
|
|
11
|
+
gatherMessagesAsOAIConversation(message: Message, issuer: string): Promise<DyNTS_OAI_GPT_Message[]>;
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=dias.service-base.d.ts.map
|
|
@@ -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;
|
|
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;AAGlG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAKnG,8BAAsB,sBAAuB,SAAQ,8BAA8B;IAEjF,wBAAwB,IAAI,6BAA6B;IAGzD,QAAQ,CAAC,UAAU,EAAE,6BAA6B,CAAmC;IAErF,mBAAmB,EAAE,MAAM,CAAkD;IAE7E,SAAS;IAQH,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAuB1F,+BAA+B,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAUpC"}
|
|
@@ -5,6 +5,7 @@ const dibo_main_control_service_1 = require("../../discord-bot/_services/dibo-ma
|
|
|
5
5
|
const oai_llm_chat_service_base_1 = require("../../open-ai/_services/oai-llm-chat.service-base");
|
|
6
6
|
const dias_global_settings_const_1 = require("../_collections/dias-global-settings.const");
|
|
7
7
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
8
|
+
const dias_util_1 = require("../_collections/dias.util");
|
|
8
9
|
class DyNTS_DiAs_ServiceBase extends dibo_main_control_service_1.DyNTS_DiBo_Main_ControlService {
|
|
9
10
|
getLLMChatControlService() {
|
|
10
11
|
return new oai_llm_chat_service_base_1.DyNTS_OAI_LLMChat_ServiceBase();
|
|
@@ -16,7 +17,7 @@ class DyNTS_DiAs_ServiceBase extends dibo_main_control_service_1.DyNTS_DiBo_Main
|
|
|
16
17
|
global_settings_const_1.DyNTS_global_settings.dias_settings ??= dias_global_settings_const_1.DyNTS_DiAs_global_settings;
|
|
17
18
|
this.llmChat_CS.defaultSettings.systemPrompt = this.defaultSystemPrompt;
|
|
18
19
|
}
|
|
19
|
-
async
|
|
20
|
+
async gatherDiscordMessagesForMessage(message, limit = 100) {
|
|
20
21
|
const channel = message.channel;
|
|
21
22
|
const userId = message.author.id;
|
|
22
23
|
const messages = await channel.messages.fetch({ limit: limit }).then(messages => messages.filter(msg => !dias_global_settings_const_1.DyNTS_DiAs_global_settings.skipConversationMessagesFlags.some(flag => msg.content.includes(flag))).map(msg => msg) // this last part creates simple array from Discord Collection
|
|
@@ -29,6 +30,14 @@ class DyNTS_DiAs_ServiceBase extends dibo_main_control_service_1.DyNTS_DiBo_Main
|
|
|
29
30
|
messages.sort((a, b) => a.createdTimestamp - b.createdTimestamp);
|
|
30
31
|
return messages;
|
|
31
32
|
}
|
|
33
|
+
async gatherMessagesAsOAIConversation(message, issuer) {
|
|
34
|
+
const messages = await this.gatherDiscordMessagesForMessage(message);
|
|
35
|
+
return dias_util_1.DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation({
|
|
36
|
+
messages: messages,
|
|
37
|
+
botClientId: this.botClientId,
|
|
38
|
+
botDisplayName: this.botDisplayName,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
32
41
|
}
|
|
33
42
|
exports.DyNTS_DiAs_ServiceBase = DyNTS_DiAs_ServiceBase;
|
|
34
43
|
//# sourceMappingURL=dias.service-base.js.map
|
|
@@ -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;
|
|
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;AAGpF,yDAA4D;AAG5D,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,+BAA+B,CAAC,OAAgB,EAAE,QAAgB,GAAG;QACzE,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;IAED,KAAK,CAAC,+BAA+B,CACnC,OAAgB,EAChB,MAAc;QAGd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAErE,OAAO,2BAAe,CAAC,uCAAuC,CAAC;YAC7D,QAAQ,EAAE,QAAQ;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;IACL,CAAC;CACF;AArDD,wDAqDC"}
|
|
@@ -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,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;
|
|
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;IAmIb,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"}
|
|
@@ -72,7 +72,11 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
72
72
|
async getMessageIsForBotToHandle(message, issuer, dontRemovePing) {
|
|
73
73
|
try {
|
|
74
74
|
if (!this.discordServer || !this.mainDiscordBot_CS || !this.botClientId) {
|
|
75
|
-
fsm_dynamo_1.DyFM_Log.
|
|
75
|
+
fsm_dynamo_1.DyFM_Log.H_error('🚫❌ Bot not initialized yet. END wont respond to message:', message.content, new Error('Bot not initialized yet').stack);
|
|
76
|
+
await this.start(issuer);
|
|
77
|
+
if (!this.discordServer || !this.mainDiscordBot_CS || !this.botClientId) {
|
|
78
|
+
fsm_dynamo_1.DyFM_Log.H_error('🚫❌❌ can not start bot. END wont respond to message:', message.content, new Error('can not start bot').stack);
|
|
79
|
+
}
|
|
76
80
|
return false;
|
|
77
81
|
}
|
|
78
82
|
const messageIsReplyTo = message.channel.messages.cache.get(message?.reference?.messageId);
|
|
@@ -84,8 +88,8 @@ class DyNTS_DiBo_IO_ControlService extends singleton_service_1.DyNTS_SingletonSe
|
|
|
84
88
|
message.author.displayName === this.botDisplayName;
|
|
85
89
|
const haveSkipFlags = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.messageSettings.skipFlags.some(flag => message.content.includes(flag));
|
|
86
90
|
const channelName = message.channel?.name;
|
|
87
|
-
const isInDefaultChannel = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.defaultChannels.includes(channelName);
|
|
88
91
|
const isDMChannel = message.channel.isDMBased();
|
|
92
|
+
const isInDefaultChannel = dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.defaultChannels.includes(channelName) || (isDMChannel && dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.dmIsAllowed);
|
|
89
93
|
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);
|
|
90
94
|
if (!isAllowedChannel) {
|
|
91
95
|
if (dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.debugLevel >= 2) {
|
|
@@ -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":"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
|
|
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,4 +1,4 @@
|
|
|
1
|
-
import { Client, Guild, Role, TextChannel } from 'discord.js';
|
|
1
|
+
import { Client, Guild, Message, Role, TextChannel } from 'discord.js';
|
|
2
2
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
3
3
|
import { DyNTS_DiBo_Routines_ControlService } from './dibo-routines.control-service';
|
|
4
4
|
import { DyNTS_DiBo_IO_ControlService } from './dibo-io.control-service';
|
|
@@ -49,13 +49,15 @@ export declare abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_Singl
|
|
|
49
49
|
private _channelsByNames;
|
|
50
50
|
private _rolesByNames;
|
|
51
51
|
protected debugLog: boolean;
|
|
52
|
-
protected constructor();
|
|
52
|
+
protected constructor(dontSetupAutomatically?: boolean);
|
|
53
53
|
setup(issuer: string): Promise<void>;
|
|
54
54
|
start(issuer: string): Promise<void>;
|
|
55
55
|
getRolePingByName(roleName: string): Promise<string>;
|
|
56
56
|
getRolePingsByName(roleNames: string[]): Promise<string>;
|
|
57
57
|
getRoleByName(roleName: string): Role;
|
|
58
58
|
getChannelByName(channelName: string): TextChannel;
|
|
59
|
+
sendMessageToChannelByName(channelName: string, message: string, issuer: string): Promise<Message>;
|
|
60
|
+
clearChannel(channel: TextChannel, issuer: string): Promise<void>;
|
|
59
61
|
}
|
|
60
62
|
/**
|
|
61
63
|
* A leggyakoribb client.on(...) események a következők (TypeScript + discord.js 14+):
|
|
@@ -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,
|
|
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,EAA2B,OAAO,EAAY,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,aACP,sBAAsB,CAAC,EAAE,OAAO;IA2B5B,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkIpC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBpC,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;IAS5C,0BAA0B,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;IAmCb,YAAY,CAChB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;CAuCjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG"}
|
|
@@ -62,7 +62,7 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
62
62
|
_channelsByNames = {};
|
|
63
63
|
_rolesByNames = {};
|
|
64
64
|
debugLog = false;
|
|
65
|
-
constructor() {
|
|
65
|
+
constructor(dontSetupAutomatically) {
|
|
66
66
|
super();
|
|
67
67
|
global_settings_const_1.DyNTS_global_settings.bot_settings ??= dibo_global_settings_conts_1.DyNTS_DiBo_global_settings;
|
|
68
68
|
if (this.client) {
|
|
@@ -75,7 +75,9 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
75
75
|
intents: global_settings_const_1.DyNTS_global_settings.bot_settings.intents,
|
|
76
76
|
partials: global_settings_const_1.DyNTS_global_settings.bot_settings.partials,
|
|
77
77
|
});
|
|
78
|
-
|
|
78
|
+
if (!dontSetupAutomatically) {
|
|
79
|
+
this.setup('system-init');
|
|
80
|
+
}
|
|
79
81
|
}
|
|
80
82
|
async setup(issuer) {
|
|
81
83
|
try {
|
|
@@ -132,6 +134,7 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
132
134
|
}
|
|
133
135
|
await this.start(issuer);
|
|
134
136
|
//await Operations.reportIn(this._discordServer, this.client)
|
|
137
|
+
fsm_dynamo_1.DyFM_Log.success('Discord Bot setup complete');
|
|
135
138
|
resolve();
|
|
136
139
|
});
|
|
137
140
|
this.client.on('messageCreate', (message) => {
|
|
@@ -176,6 +179,7 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
176
179
|
this.routines_CS = this.getRoutinesControlService();
|
|
177
180
|
await this.routines_CS.start(issuer);
|
|
178
181
|
await this.botIO_CS.start(issuer);
|
|
182
|
+
fsm_dynamo_1.DyFM_Log.success('Discord Bot started');
|
|
179
183
|
}
|
|
180
184
|
catch (error) {
|
|
181
185
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
@@ -200,6 +204,60 @@ class DyNTS_DiBo_Main_ControlService extends singleton_service_1.DyNTS_Singleton
|
|
|
200
204
|
this._channelsByNames[channelName] ??= dibo_operations_util_1.DyNTS_DiBo_Operations_Util.findTextChannelByName(this.discordServer.channels, channelName);
|
|
201
205
|
return this._channelsByNames[channelName];
|
|
202
206
|
}
|
|
207
|
+
async sendMessageToChannelByName(channelName, message, issuer) {
|
|
208
|
+
try {
|
|
209
|
+
const channel = await this.getChannelByName(channelName);
|
|
210
|
+
if (!channel) {
|
|
211
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
212
|
+
...this.getDefaultErrorSettings('sendMessageToChannelByName', new Error('Channel not found'), issuer),
|
|
213
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-MCS-SMCN1`,
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
if (!channel.isTextBased()) {
|
|
217
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
218
|
+
...this.getDefaultErrorSettings('sendMessageToChannelByName', new Error('Channel is not a text channel'), issuer),
|
|
219
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-MCS-SMCN2`,
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
return await channel.send(message);
|
|
223
|
+
}
|
|
224
|
+
catch (error) {
|
|
225
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
226
|
+
...this.getDefaultErrorSettings('sendMessageToChannelByName', error, issuer),
|
|
227
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-MCS-SMCN0`,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
async clearChannel(channel, issuer) {
|
|
232
|
+
try {
|
|
233
|
+
fsm_dynamo_1.DyFM_Log.testInfo('Clearing channel... ', channel.name);
|
|
234
|
+
let messages = (await dibo_operations_util_1.DyNTS_DiBo_Operations_Util.fetchAllMessagesWithPaging(channel)).map((message) => message);
|
|
235
|
+
while (messages.length) {
|
|
236
|
+
fsm_dynamo_1.DyFM_Log.testInfo('Deleting next 1000 messages... ', messages.length);
|
|
237
|
+
await Promise.all(messages.map(message => {
|
|
238
|
+
return new Promise(async (resolve, reject) => {
|
|
239
|
+
await dibo_operations_util_1.DyNTS_DiBo_Operations_Util.deleteMessage(message).catch((error) => {
|
|
240
|
+
fsm_dynamo_1.DyFM_Log.error('Failed to delete message', error);
|
|
241
|
+
});
|
|
242
|
+
messages = messages.filter(m => m.id !== message.id);
|
|
243
|
+
fsm_dynamo_1.DyFM_Log.success('Deleted message', message.content);
|
|
244
|
+
resolve(true);
|
|
245
|
+
});
|
|
246
|
+
}));
|
|
247
|
+
if (messages.length === 0) {
|
|
248
|
+
messages = (await dibo_operations_util_1.DyNTS_DiBo_Operations_Util.fetchAllMessagesWithPaging(channel)).map((message) => message);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
fsm_dynamo_1.DyFM_Log.success('Deleted messages', messages.length);
|
|
252
|
+
channel.send('[SYSTEM|OPERATION|RESULT] Csatorna üzeneteinek törlése sikeresen befejeződött.');
|
|
253
|
+
}
|
|
254
|
+
catch (error) {
|
|
255
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
256
|
+
...this.getDefaultErrorSettings('clearChannel', error, issuer),
|
|
257
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-MCS-CC0`,
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
}
|
|
203
261
|
}
|
|
204
262
|
exports.DyNTS_DiBo_Main_ControlService = DyNTS_DiBo_Main_ControlService;
|
|
205
263
|
/**
|
|
@@ -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,EAAE,IAAI,EAAE,EAAE,IAAI,6CAAqB,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC;IACzF,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC;IACxC,CAAC;IAES,QAAQ,CAA+B;IAGvC,WAAW,CAAqC;IAGlD,gBAAgB,GAEpB,EAAE,CAAC;IAEC,aAAa,GAEjB,EAAE,CAAC;IAEG,QAAQ,GAAG,KAAK,CAAC;IAE3B;
|
|
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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"}
|