diff --git a/package-lock.json b/package-lock.json index cf08658..de8d2c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,18 @@ { "name": "mybb-april-fools", - "version": "1.0.0", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mybb-april-fools", - "version": "1.0.0", + "version": "1.1.0", "license": "https://forumd.ru/viewtopic.php?id=5751#rule", "dependencies": { "@babel/eslint-parser": "^7.24.1", "@typescript-eslint/eslint-plugin": "^7.3.1", "cursor-effects": "^1.0.11", + "ignore-loader": "^0.1.2", "jquery": "^3.6.4", "webpack-utf8-bom": "^1.4.0" }, @@ -7587,6 +7588,11 @@ "node": ">= 4" } }, + "node_modules/ignore-loader": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ignore-loader/-/ignore-loader-0.1.2.tgz", + "integrity": "sha512-yOJQEKrNwoYqrWLS4DcnzM7SEQhRKis5mB+LdKKh4cPmGYlLPR0ozRzHV5jmEk2IxptqJNQA5Cc0gw8Fj12bXA==" + }, "node_modules/ignore-walk": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz", diff --git a/package.json b/package.json index c71caa5..54eb52b 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "@babel/eslint-parser": "^7.24.1", "@typescript-eslint/eslint-plugin": "^7.3.1", "cursor-effects": "^1.0.11", + "ignore-loader": "^0.1.2", "jquery": "^3.6.4", "webpack-utf8-bom": "^1.4.0" } diff --git a/src/joker.ts b/src/joker.ts index 70dae58..5b54e39 100644 --- a/src/joker.ts +++ b/src/joker.ts @@ -1,6 +1,7 @@ -import './types/mybb.d.ts'; +import './types/mybb.d'; import {Joke, JokeSettings, StoppableJoke} from './joke'; import {JokerUI} from './ui'; +import {debug} from './common'; /** * Блок обработки перво-апрельских шуток @@ -13,6 +14,7 @@ export class JokerClass { * Общие настройки системы */ core_settings = new CoreSettings(); + /** * Перечисление всех шуток */ @@ -235,9 +237,10 @@ export class JokerClass { if (!forced && (!joke.settings.enabled || !this.check(joke.settings.chance)) ) { + debug(joke.title, '- шутка не включена'); return; } - + debug(joke.title, '- шутка включена'); joke.start(); } @@ -297,7 +300,7 @@ type JokeHandler = () => void; * Объект хранения шуток */ interface JokeMap { - [key: string]: Joke< JokeSettings>; + [key: string]: Joke; } /** diff --git a/src/ui.ts b/src/ui.ts index d4d902e..6561820 100644 --- a/src/ui.ts +++ b/src/ui.ts @@ -1,7 +1,5 @@ -// / - -import './types/html.d.ts'; -import './types/mybb.d.ts'; +import './types/html.d'; +import './types/mybb.d'; import {JokerClass} from './joker'; import $ from 'jquery';