Jerry/crystelf-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/crystelf-plugin.git synced 2025-12-05 15:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat:完善at匹配

Browse Source
This commit is contained in:
Jerry 2025-10-18 00:49:20 +08:00
parent 92bfe8087c
commit 337c7e9f60
2 changed files with 283 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
apps/ai.js
View File

@ -22,7 +22,7 @@ export class crystelfAI extends plugin {
rule: [ rule: [
{ {
reg: `^${nickname}([\\s\\S]*)?$`, reg: `^${nickname}([\\s\\S]*)?$`,
fnc: 'index', fnc: 'in',
}, },
], ],
}); });
@ -43,7 +43,25 @@ export class crystelfAI extends plugin {
} }
} }
async index(e) { async in(e){
return await index(e);
}
}
Bot.on("message.group",async(e)=>{
let flag = false;
if(e.message){
e.message.forEach(message=>{
if(message.type === 'at' && message.qq == e.bot.uin){
flag = true;
}
})
}
if(!flag) return;
return await index(e);
})
async function index(e) {
try { try {
//logger.info('111') //logger.info('111')
const config = await ConfigControl.get(); const config = await ConfigControl.get();
@ -60,17 +78,14 @@ export class crystelfAI extends plugin {
if (e.user_id === e.bot.uin) { if (e.user_id === e.bot.uin) {
return; return;
} }
const userMessage = this.extractUserMessage(e.msg, nickname); const userMessage = extractUserMessage(e.msg, nickname,e);
if (!userMessage) { if (!userMessage) {
return; return;
} }
logger.info( const result = await processMessage(userMessage, e, aiConfig);
`[crystelf-ai] 收到消息: 群${e.group_id}, 用户${e.user_id}, 内容: ${userMessage}`
);
const result = await this.processMessage(userMessage, e, aiConfig);
if (result && result.length > 0) { if (result && result.length > 0) {
// TODO 优化流式输出 // TODO 优化流式输出
await this.sendResponse(e, result); await sendResponse(e, result);
} }
} catch (error) { } catch (error) {
logger.error(`[crystelf-ai] 处理消息失败: ${error.message}`); logger.error(`[crystelf-ai] 处理消息失败: ${error.message}`);
@ -80,12 +95,22 @@ export class crystelfAI extends plugin {
} }
} }
extractUserMessage(msg, nickname) { function extractUserMessage(msg, nickname,e) {
if (!msg || !nickname) return ''; if (!msg || !nickname) return '';
const regex = new RegExp(`^${nickname}\\s*([\\s\\S]*)?$`); const regex = new RegExp(`^${nickname}\\s*([\\s\\S]*)?$`);
const match = msg.match(regex); const match = msg.match(regex);
if (match && match[1]) { if (match && match[1]) {
return match[1].trim(); return match[1].trim();
} else {
if(e.message){
let text;
e.message.forEach(message=>{
if(message.type === 'text'){
text = message.text;
}
})
if(text) return text;
}
} }
logger.warn('[crystelf-ai] 字符串匹配失败,使用空字符串操作'); logger.warn('[crystelf-ai] 字符串匹配失败,使用空字符串操作');
return ''; return '';
@ -98,19 +123,19 @@ export class crystelfAI extends plugin {
* @param aiConfig * @param aiConfig
* @returns {Promise<Array|null>} * @returns {Promise<Array|null>}
*/ */
async processMessage(userMessage, e, aiConfig) { async function processMessage(userMessage, e, aiConfig) {
const mode = aiConfig?.mode || 'mix'; const mode = aiConfig?.mode || 'mix';
logger.info(`[crystelf-ai] 群${e.group_id} 用户${e.user_id}使用${mode}进行回复..`) logger.info(`[crystelf-ai] 群${e.group_id} 用户${e.user_id}使用${mode}进行回复..`)
switch (mode) { switch (mode) {
case 'keyword': case 'keyword':
return await this.handleKeywordMode(userMessage, e); return await handleKeywordMode(userMessage, e);
case 'ai': case 'ai':
return await this.handleAiMode(userMessage, e, aiConfig); return await handleAiMode(userMessage, e, aiConfig);
case 'mix': case 'mix':
return await this.handleMixMode(userMessage, e, aiConfig); return await handleMixMode(userMessage, e, aiConfig);
default: default:
logger.warn(`[crystelf-ai] 未知匹配模式: ${mode},将使用混合模式输出`); logger.warn(`[crystelf-ai] 未知匹配模式: ${mode},将使用混合模式输出`);
return await this.handleMixMode(userMessage, e, aiConfig); return await handleMixMode(userMessage, e, aiConfig);
} }
} }
@ -120,7 +145,7 @@ export class crystelfAI extends plugin {
* @param e * @param e
* @returns {Promise<[{type: string, data: string}]>} * @returns {Promise<[{type: string, data: string}]>}
*/ */
async handleKeywordMode(userMessage, e) { async function handleKeywordMode(userMessage, e) {
const matchResult = await KeywordMatcher.matchKeywords(userMessage, 'ai'); const matchResult = await KeywordMatcher.matchKeywords(userMessage, 'ai');
if (matchResult && matchResult.matched) { if (matchResult && matchResult.matched) {
@ -143,16 +168,16 @@ export class crystelfAI extends plugin {
]; ];
} }
async handleAiMode(userMessage, e, aiConfig) { async function handleAiMode(userMessage, e, aiConfig) {
return await this.callAiForResponse(userMessage, e, aiConfig); return await callAiForResponse(userMessage, e, aiConfig);
} }
async handleMixMode(userMessage, e, aiConfig) { async function handleMixMode(userMessage, e, aiConfig) {
const isTooLong = await KeywordMatcher.isMessageTooLong(userMessage); const isTooLong = await KeywordMatcher.isMessageTooLong(userMessage);
if (isTooLong) { if (isTooLong) {
//消息太长,使用AI回复 //消息太长,使用AI回复
return await this.callAiForResponse(userMessage, e, aiConfig); return await callAiForResponse(userMessage, e, aiConfig);
} else { } else {
const matchResult = await KeywordMatcher.matchKeywords(userMessage, 'ai'); const matchResult = await KeywordMatcher.matchKeywords(userMessage, 'ai');
if (matchResult && matchResult.matched) { if (matchResult && matchResult.matched) {
@ -167,12 +192,12 @@ export class crystelfAI extends plugin {
]; ];
} else { } else {
//关键词匹配失败,使用AI回复 //关键词匹配失败,使用AI回复
return await this.callAiForResponse(userMessage, e, aiConfig); return await callAiForResponse(userMessage, e, aiConfig);
} }
} }
} }
async callAiForResponse(userMessage, e, aiConfig) { async function callAiForResponse(userMessage, e, aiConfig) {
try { try {
//创建session //创建session
const session = SessionManager.createOrGetSession(e.group_id, e.user_id); const session = SessionManager.createOrGetSession(e.group_id, e.user_id);
@ -227,7 +252,7 @@ export class crystelfAI extends plugin {
* @param messages 消息数组 * @param messages 消息数组
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async sendResponse(e, messages) { async function sendResponse(e, messages) {
try { try {
for (const message of messages) { for (const message of messages) {
switch (message.type) { switch (message.type) {
@ -245,15 +270,15 @@ export class crystelfAI extends plugin {
break; break;
case 'code': case 'code':
await this.handleCodeMessage(e, message); await handleCodeMessage(e, message);
break; break;
case 'markdown': case 'markdown':
await this.handleMarkdownMessage(e, message); await handleMarkdownMessage(e, message);
break; break;
case 'meme': case 'meme':
await this.handleMemeMessage(e, message); await handleMemeMessage(e, message);
break; break;
case 'at': case 'at':
@ -261,15 +286,15 @@ export class crystelfAI extends plugin {
break; break;
case 'poke': case 'poke':
await this.handlePokeMessage(e, message); await handlePokeMessage(e, message);
break; break;
case 'like': case 'like':
await this.handleLikeMessage(e, message); await handleLikeMessage(e, message);
break; break;
case 'recall': case 'recall':
await this.handleRecallMessage(e, message); await handleRecallMessage(e, message);
break; break;
default: default:
@ -281,7 +306,7 @@ export class crystelfAI extends plugin {
} }
} }
async handleCodeMessage(e, message) { async function handleCodeMessage(e, message) {
try { try {
//渲染代码为图片 //渲染代码为图片
const imagePath = await Renderer.renderCode(message.data, message.language || 'text'); const imagePath = await Renderer.renderCode(message.data, message.language || 'text');
@ -297,7 +322,7 @@ export class crystelfAI extends plugin {
} }
} }
async handleMarkdownMessage(e, message) { async function handleMarkdownMessage(e, message) {
try { try {
//渲染Markdown为图片 //渲染Markdown为图片
const imagePath = await Renderer.renderMarkdown(message.data); const imagePath = await Renderer.renderMarkdown(message.data);
@ -313,7 +338,7 @@ export class crystelfAI extends plugin {
} }
} }
async handleMemeMessage(e, message) { async function handleMemeMessage(e, message) {
try { try {
const config = await ConfigControl.get('ai'); const config = await ConfigControl.get('ai');
const memeConfig = config?.memeConfig || {}; const memeConfig = config?.memeConfig || {};
@ -334,7 +359,7 @@ export class crystelfAI extends plugin {
} }
} }
async handlePokeMessage(e, message) { async function handlePokeMessage(e, message) {
try { try {
await Group.groupPoke(e, message.id, e.group_id); await Group.groupPoke(e, message.id, e.group_id);
} catch (error) { } catch (error) {
@ -342,7 +367,7 @@ export class crystelfAI extends plugin {
} }
} }
async handleLikeMessage(e, message) { async function handleLikeMessage(e, message) {
try { try {
// TODO 点赞逻辑 // TODO 点赞逻辑
const adapter = await YunzaiUtils.getAdapter(e); const adapter = await YunzaiUtils.getAdapter(e);
@ -355,7 +380,7 @@ export class crystelfAI extends plugin {
} }
} }
async handleRecallMessage(e, message) { async function handleRecallMessage(e, message) {
try { try {
if (message.seq) { if (message.seq) {
await Message.deleteMsg(e, message.seq); await Message.deleteMsg(e, message.seq);
@ -364,7 +389,6 @@ export class crystelfAI extends plugin {
logger.error(`[crystelf-ai] 撤回消息失败: ${error.message}`); logger.error(`[crystelf-ai] 撤回消息失败: ${error.message}`);
} }
} }
}
//定期清理过期sessions //定期清理过期sessions
setInterval( setInterval(

1
modules/ollama/ollamaChat.js
View File

@ -7,7 +7,6 @@ class OllamaChat {
} }
/** /**
*
* @param apiKey 密钥 * @param apiKey 密钥
* @param baseUrl ollamaAPI地址 * @param baseUrl ollamaAPI地址
*/ */