Commit 61a9cc22 authored by nanahira's avatar nanahira

put welcome to MenuManager

parent 9fea01c8
Pipeline #43282 failed with stages
in 76 minutes and 49 seconds
...@@ -21,9 +21,9 @@ export const FeatsModule = createAppContext<ContextState>() ...@@ -21,9 +21,9 @@ export const FeatsModule = createAppContext<ContextState>()
.provide(HidePlayerNameProvider) .provide(HidePlayerNameProvider)
.provide(KoishiContextService) .provide(KoishiContextService)
.provide(CommandsService) // some chat commands .provide(CommandsService) // some chat commands
.provide(Welcome)
.provide(MenuManager) .provide(MenuManager)
.provide(ClientVersionCheck) .provide(ClientVersionCheck)
.provide(Welcome)
.provide(PlayerStatusNotify) .provide(PlayerStatusNotify)
.provide(CloudReplayService) // persist duel records .provide(CloudReplayService) // persist duel records
.provide(ChatgptService) // AI-room chat replies .provide(ChatgptService) // AI-room chat replies
......
...@@ -13,6 +13,7 @@ import { Chnroute, Client, I18nService } from '../client'; ...@@ -13,6 +13,7 @@ import { Chnroute, Client, I18nService } from '../client';
import { DefaultHostinfo } from '../room'; import { DefaultHostinfo } from '../room';
import { resolvePanelPageLayout } from '../utility'; import { resolvePanelPageLayout } from '../utility';
import { Awaitable } from 'nfkit'; import { Awaitable } from 'nfkit';
import { Welcome } from './welcome';
export type MenuEntry = { export type MenuEntry = {
title: string; title: string;
...@@ -46,6 +47,7 @@ type MenuView = { ...@@ -46,6 +47,7 @@ type MenuView = {
export class MenuManager { export class MenuManager {
private i18n = this.ctx.get(() => I18nService); private i18n = this.ctx.get(() => I18nService);
private chnroute = this.ctx.get(() => Chnroute); private chnroute = this.ctx.get(() => Chnroute);
private welcome = this.ctx.get(() => Welcome);
constructor(private ctx: Context) { constructor(private ctx: Context) {
this.ctx.middleware( this.ctx.middleware(
...@@ -87,6 +89,7 @@ export class MenuManager { ...@@ -87,6 +89,7 @@ export class MenuManager {
if (client.menuOffset == null) { if (client.menuOffset == null) {
client.menuOffset = 0; client.menuOffset = 0;
} }
await this.welcome.sendConfigWelcome(client);
await this.renderMenu(client); await this.renderMenu(client);
} }
......
...@@ -9,7 +9,6 @@ interface MenuNode { ...@@ -9,7 +9,6 @@ interface MenuNode {
export class JoinBlankPassMenu { export class JoinBlankPassMenu {
private logger = this.ctx.createLogger(this.constructor.name); private logger = this.ctx.createLogger(this.constructor.name);
private welcome = this.ctx.get(() => Welcome);
private menuManager = this.ctx.get(() => MenuManager); private menuManager = this.ctx.get(() => MenuManager);
private enabled = this.ctx.config.getBoolean('ENABLE_MENU'); private enabled = this.ctx.config.getBoolean('ENABLE_MENU');
private rootMenu = this.loadRootMenu(); private rootMenu = this.loadRootMenu();
...@@ -36,7 +35,6 @@ export class JoinBlankPassMenu { ...@@ -36,7 +35,6 @@ export class JoinBlankPassMenu {
} }
this.enterMenuContext(client, msg); this.enterMenuContext(client, msg);
await this.welcome.sendConfigWelcome(client);
await this.openMenuByPath(client, client.menuPath || []); await this.openMenuByPath(client, client.menuPath || []);
return msg; return msg;
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment