Skip to content

Commit 1199e22

Browse files
committed
feat: 增加指令 /(.+)是什么歌$/, /^[\w\/]*查歌(.+)/
1 parent 8477951 commit 1199e22

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

packages/botcore/src/modules/musicSearch.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import genSongInfoButtons from '../utils/genSongInfoButtons';
22
import { Song } from '@clansty/maibot-types/src';
33
import LyricsHelper from '../utils/LyricsHelper';
4-
import { BotTypes, BundledMessageBase, MessageButtonSwitchInline, MessageButtonUrl, SendMessageAction } from '@clansty/maibot-firm';
4+
import { BotTypes, BundledMessageBase, MessageButtonSwitchInline, MessageButtonUrl, MessageEventBase, SendMessageAction } from '@clansty/maibot-firm';
55
import { BuilderEnv } from '../botBuilder';
66
import { MESSAGE_TEMPLATE } from '../MessageTemplate';
77

@@ -120,8 +120,7 @@ export default <T extends BotTypes>({ bot, env, getContext, musicToFile }: Build
120120
return true;
121121
});
122122

123-
bot.registerCommand(['search', 'maimai', 's'], async (event) => {
124-
const kw = event.params.join(' ').trim();
123+
const handleSearch = async (event: MessageEventBase<T>, kw: string) => {
125124
if (!kw) {
126125
await event.reply()
127126
.setText('请输入要搜索的歌曲名')
@@ -154,5 +153,13 @@ export default <T extends BotTypes>({ bot, env, getContext, musicToFile }: Build
154153
const song = results[0];
155154
await sendSong(event.reply(), song);
156155
return true;
156+
};
157+
158+
bot.registerCommand(['search', 'maimai', 's'], async (event) => {
159+
return handleSearch(event, event.params.join(' ').trim());
160+
});
161+
162+
bot.registerKeyword([/(.+)$/, /^[\w\/]*(.+)/], async (event) => {
163+
return handleSearch(event, event.match[1].trim());
157164
});
158165
}

0 commit comments

Comments
 (0)