Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: remove deprecation

Browse Source
This commit is contained in:
undefined committed 2022-10-05 18:54:49 +08:00
1 parent 833b960a48
commit 9971967fd1
11 files changed
+47 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -48,7 +48,7 @@
"require-resolve-hook": "^1.1.0",
"saslprep": "^1.0.3",
"schemastery": "^3.5.4",
"semver": "^7.3.7",
"semver": "^7.3.8",
"serialize-javascript": "^6.0.0",
"superagent": "^8.0.2",
"thirty-two": "^1.0.2",
packages/hydrooj/src/entry/worker.ts
+1 -1
View File
@@ -40,7 +40,7 @@ export async function apply(ctx: Context) {
await storage.loadStorageService();
await require('../service/server').apply(ctx);
// Make sure everything is ready and then start main entry
if (argv.options.watch) await ctx.loader.reloadPlugin(ctx, 'hydrooj/src/service/watcher', {});
if (argv.options.watch) ctx.plugin(require('../service/watcher').default, {});
await ctx.root.start();
require('../lib/index');
await lib(pending, fail, ctx);
packages/hydrooj/src/interface.ts
+2 -1
View File
@@ -726,7 +726,8 @@ declare global {
addons: string[],
}
}
var bus: typeof import('./service/bus'); // eslint-disable-line
/** @deprecated */
var bus: Context; // eslint-disable-line
var app: Context; // eslint-disable-line
var Hydro: HydroGlobal; // eslint-disable-line
var addons: string[]; // eslint-disable-line
packages/hydrooj/src/model/setting.ts
+5 -5
View File
@@ -70,7 +70,7 @@ export const Setting = (
export const PreferenceSetting = (...settings: _Setting[]) => {
for (const setting of settings) {
if (PREFERENCE_SETTINGS.find((s) => s.key === setting.key)) throw new Error(`Duplicate setting key: ${setting.key}`);
if (PREFERENCE_SETTINGS.find((s) => s.key === setting.key)) logger.warn(`Duplicate setting key: ${setting.key}`);
PREFERENCE_SETTINGS.push(setting);
SETTINGS.push(setting);
SETTINGS_BY_KEY[setting.key] = setting;
@@ -78,7 +78,7 @@ export const PreferenceSetting = (...settings: _Setting[]) => {
};
export const AccountSetting = (...settings: _Setting[]) => {
for (const setting of settings) {
if (ACCOUNT_SETTINGS.find((s) => s.key === setting.key)) throw new Error(`Duplicate setting key: ${setting.key}`);
if (ACCOUNT_SETTINGS.find((s) => s.key === setting.key)) logger.warn(`Duplicate setting key: ${setting.key}`);
ACCOUNT_SETTINGS.push(setting);
SETTINGS.push(setting);
SETTINGS_BY_KEY[setting.key] = setting;
@@ -86,21 +86,21 @@ export const AccountSetting = (...settings: _Setting[]) => {
};
export const DomainUserSetting = (...settings: _Setting[]) => {
for (const setting of settings) {
if (DOMAIN_USER_SETTINGS.find((s) => s.key === setting.key)) throw new Error(`Duplicate setting key: ${setting.key}`);
if (DOMAIN_USER_SETTINGS.find((s) => s.key === setting.key)) logger.warn(`Duplicate setting key: ${setting.key}`);
DOMAIN_USER_SETTINGS.push(setting);
DOMAIN_USER_SETTINGS_BY_KEY[setting.key] = setting;
}
};
export const DomainSetting = (...settings: _Setting[]) => {
for (const setting of settings) {
if (DOMAIN_SETTINGS.find((s) => s.key === setting.key)) throw new Error(`Duplicate setting key: ${setting.key}`);
if (DOMAIN_SETTINGS.find((s) => s.key === setting.key)) logger.warn(`Duplicate setting key: ${setting.key}`);
DOMAIN_SETTINGS.push(setting);
DOMAIN_SETTINGS_BY_KEY[setting.key] = setting;
}
};
export const SystemSetting = (...settings: _Setting[]) => {
for (const setting of settings) {
if (SYSTEM_SETTINGS.find((s) => s.key === setting.key)) throw new Error(`Duplicate setting key: ${setting.key}`);
if (SYSTEM_SETTINGS.find((s) => s.key === setting.key)) logger.warn(`Duplicate setting key: ${setting.key}`);
SYSTEM_SETTINGS.push(setting);
SYSTEM_SETTINGS_BY_KEY[setting.key] = setting;
}
packages/hydrooj/src/service/bus.ts
+1
View File
@@ -126,3 +126,4 @@ export const serial: any = app.parallel.bind(app);
export const broadcast = app.broadcast.bind(app);
global.Hydro.service.bus = app as any;
global.bus = app;