@globalart/nestcord 1.3.11 → 1.4.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2003 GlobalArt Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/localization/adapters/base-localization.adapter.d.ts

@@ -2,4 +2,5 @@ export declare abstract class BaseLocalizationAdapter<Options = unknown> {
     protected readonly options?: Options;
     constructor(options?: Options);
     abstract getTranslation(key: string, locale: string, ...args: unknown[]): string;
+    abstract translate(key: string, ...args: unknown[]): string;
 }

package/dist/localization/adapters/default-localization.adapter.d.ts

@@ -5,6 +5,7 @@ interface DefaultLocalizationAdapterOptions {
 }
 export declare class DefaultLocalizationAdapter extends BaseLocalizationAdapter<DefaultLocalizationAdapterOptions> {
     getTranslation(key: string, locale: string, placeholders?: Record<string, string>): string;
+    translate(key: string, placeholders?: Record<string, string>): string;
     private getTranslations;
     private getFallbackTranslation;
 }

package/dist/localization/adapters/default-localization.adapter.js

@@ -3,11 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultLocalizationAdapter = void 0;
 const text_utils_1 = require("@globalart/text-utils");
 const base_localization_adapter_1 = require("./base-localization.adapter");
+const interceptors_1 = require("../interceptors");
 class DefaultLocalizationAdapter extends base_localization_adapter_1.BaseLocalizationAdapter {
     getTranslation(key, locale, placeholders) {
         const translation = this.getTranslations(locale)[key] || this.getFallbackTranslation(key);
         return placeholders ? (0, text_utils_1.replacePlaceholdersInString)(translation, placeholders) : translation;
     }
+    translate(key, placeholders) {
+        const currentTranslationFn = interceptors_1.LocalizationInterceptor.getCurrentTranslationFn();
+        return currentTranslationFn
+            ? currentTranslationFn(key, placeholders)
+            : this.getTranslation(key, this.options.fallbackLocale, placeholders);
+    }
     getTranslations(locale) {
         var _a, _b;
         return ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.locales) === null || _b === void 0 ? void 0 : _b[locale]) || {};

package/dist/localization/adapters/nested-localization.adapter.d.ts

@@ -8,6 +8,7 @@ interface NestedLocalizationAdapterOptions {
 }
 export declare class NestedLocalizationAdapter extends BaseLocalizationAdapter<NestedLocalizationAdapterOptions> {
     getTranslation(key: string, locale: string, placeholders?: Record<string, string>): string;
+    translate(key: string, placeholders?: Record<string, string>): string;
     private getTranslations;
     private findTranslation;
     private getFallbackTranslation;

package/dist/localization/adapters/nested-localization.adapter.js

@@ -3,12 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestedLocalizationAdapter = void 0;
 const text_utils_1 = require("@globalart/text-utils");
 const base_localization_adapter_1 = require("./base-localization.adapter");
+const interceptors_1 = require("../interceptors");
 class NestedLocalizationAdapter extends base_localization_adapter_1.BaseLocalizationAdapter {
     getTranslation(key, locale, placeholders) {
         const translations = this.getTranslations(locale);
         const translation = this.findTranslation(translations, key) || this.getFallbackTranslation(key);
         return (0, text_utils_1.replacePlaceholdersInString)(translation, placeholders);
     }
+    translate(key, placeholders) {
+        const currentTranslationFn = interceptors_1.LocalizationInterceptor.getCurrentTranslationFn();
+        return currentTranslationFn
+            ? currentTranslationFn(key, placeholders)
+            : this.getTranslation(key, this.options.fallbackLocale, placeholders);
+    }
     getTranslations(locale) {
         var _a, _b;
         return ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.locales) === null || _b === void 0 ? void 0 : _b[locale]) || {};

package/dist/stat-reporter/nestcord-stat-reporter.service.d.ts

@@ -18,4 +18,5 @@ export declare class NestCordStatReporterService implements OnModuleInit {
     private reportStats;
     private calculateServerCount;
     private logStats;
+    private logErrors;
 }

package/dist/stat-reporter/nestcord-stat-reporter.service.js

@@ -30,6 +30,7 @@ const schedule_1 = require("@nestjs/schedule");
 const cron_1 = require("cron");
 const axios_1 = require("@nestjs/axios");
 const text_utils_1 = require("@globalart/text-utils");
+const rxjs_1 = require("rxjs");
 let NestCordStatReporterService = NestCordStatReporterService_1 = class NestCordStatReporterService {
     constructor(client, shard, options, schedulerRegistry, httpService) {
         this.client = client;
@@ -63,23 +64,26 @@ let NestCordStatReporterService = NestCordStatReporterService_1 = class NestCord
     }
     reportStats(service) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            yield ((_a = this.client.application) === null || _a === void 0 ? void 0 : _a.fetch());
-            const serverCount = yield this.calculateServerCount();
-            const shardCount = ((_b = this.shard) === null || _b === void 0 ? void 0 : _b.count) || 1;
-            const bodyData = (0, text_utils_1.replacePlaceholdersInObject)(service.bodyData, { serverCount, shardCount });
-            const headerData = service.headerData || {};
-            this.httpService
-                .request({
-                method: service.method || 'POST',
-                url: service.url,
-                data: bodyData,
-                headers: headerData,
-            })
-                .subscribe({
-                next: () => this.logStats(service.name, serverCount, shardCount),
-                error: (err) => this.logger.error(`Error reporting stats for ${service.name}`, err),
-            });
+            var _a;
+            try {
+                const [_, serverCount, shardCount] = yield Promise.all([
+                    this.client.application.fetch(),
+                    this.calculateServerCount(),
+                    Promise.resolve(((_a = this.shard) === null || _a === void 0 ? void 0 : _a.count) || 1),
+                ]);
+                const bodyData = (0, text_utils_1.replacePlaceholdersInObject)(service.bodyData, { serverCount, shardCount });
+                const headerData = service.headerData || {};
+                yield (0, rxjs_1.lastValueFrom)(this.httpService.request({
+                    method: service.method || 'POST',
+                    url: service.url,
+                    data: bodyData,
+                    headers: headerData,
+                }));
+                this.logStats(service.name, serverCount, shardCount);
+            }
+            catch (err) {
+                this.logErrors(service.name, err);
+            }
         });
     }
     calculateServerCount() {
@@ -98,6 +102,12 @@ let NestCordStatReporterService = NestCordStatReporterService_1 = class NestCord
             this.logger.log(`Reporting stats for ${serviceName}, servers: ${serverCount}, shards: ${shardCount}`);
         }
     }
+    logErrors(serviceName, error) {
+        var _a;
+        if ((_a = this.options.log) !== null && _a !== void 0 ? _a : true) {
+            this.logger.error(`Error reporting stats for ${serviceName}`, error);
+        }
+    }
 };
 exports.NestCordStatReporterService = NestCordStatReporterService;
 exports.NestCordStatReporterService = NestCordStatReporterService = NestCordStatReporterService_1 = __decorate([

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@globalart/nestcord",
 	"description": "A module for creating Discord bots using NestJS, based on Discord.js",
-	"version": "1.3.11",
+	"version": "1.4.0",
 	"private": false,
 	"scripts": {
 		"build": "rimraf dist && tsc -p tsconfig.build.json",
@@ -11,7 +11,8 @@
 		"publish:dev": "npm publish --access public --tag dev",
 		"prepare": "husky ./.github/husky",
 		"format": "prettier --write \"packages/**/*.ts\"",
-		"lint": "eslint --ignore-path .gitignore packages/**/*.ts"
+		"lint": "eslint --ignore-path .gitignore packages/**/*.ts",
+		"upgrade": "npx npm-check-updates -u"
 	},
 	"lint-staged": {
 		"*.ts": "npm run format"
@@ -60,7 +61,7 @@
 		"@nestjs/common": "10.3.8",
 		"@nestjs/core": "10.3.8",
 		"@nestjs/platform-express": "^10.3.8",
-		"@types/node": "20.12.13",
+		"@types/node": "20.13.0",
 		"@typescript-eslint/eslint-plugin": "7.0.0",
 		"@typescript-eslint/parser": "6.21.0",
 		"discord-api-types": "0.37.86",