ishangsf/DeepCodeGeniusWeb-vscode
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor parent hash handling in sendMessageBase.ts

Browse Source 
- Replaced the getParentHash function with direct access to message.parent_hash.
- Updated the handleTopic function to accept undefined parentHash.
- This simplifies the code and makes the parent hash handling more straightforward.
This commit is contained in:
bobo.yang 2023-07-10 11:49:23 +08:00
parent e4c9dc9ecd
commit 1ee0cf1b34
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/handler/sendMessage.ts
View File

@ -7,7 +7,7 @@ import { stopDevChatBase, sendMessageBase } from './sendMessageBase';
let _lastMessage: any = undefined;
regInMessage({command: 'sendMessage', text: '', hash: undefined});
regInMessage({command: 'sendMessage', text: '', parent_hash: undefined});
regOutMessage({ command: 'receiveMessage', text: 'xxxx', hash: 'xxx', user: 'xxx', date: 'xxx'});
regOutMessage({ command: 'receiveMessagePartial', text: 'xxxx', user: 'xxx', date: 'xxx'});
// message: { command: 'sendMessage', text: 'xxx', hash: 'xxx'}

24
src/handler/sendMessageBase.ts
View File

@ -104,22 +104,8 @@ export async function parseMessageAndSetOptions(message: any, chatOptions: any):
return parsedMessage;
}
// 将处理父哈希的部分提取到一个单独的函数中
export function getParentHash(message: any): string|undefined {
let parentHash = undefined;
logger.channel()?.info(`request message hash: ${message.hash}`);
if (message.hash) {
const hmessage = messageHistory.find(message.hash);
parentHash = hmessage ? hmessage.parentHash : undefined;
} else {
const hmessage = messageHistory.findLast();
parentHash = hmessage ? hmessage.hash : undefined;
}
logger.channel()?.info(`parent hash: ${parentHash}`);
return parentHash;
}
export async function handleTopic(parentHash:string, message: any, chatResponse: ChatResponse) {
export async function handleTopic(parentHash:string | undefined, message: any, chatResponse: ChatResponse) {
WaitCreateTopic = true;
try {
if (!chatResponse.isError) {
@ -158,10 +144,10 @@ export async function sendMessageBase(message: any, handlePartialData: (data: {
const chatOptions: any = {};
const parsedMessage = await parseMessageAndSetOptions(message, chatOptions);
const parentHash = getParentHash(message);
if (parentHash) {
chatOptions.parent = parentHash;
if (message.parent_hash) {
chatOptions.parent = message.parent_hash;
}
logger.channel()?.info(`parent hash: ${chatOptions.parent}`);
let partialDataText = '';
const onData = (partialResponse: ChatResponse) => {
@ -170,7 +156,7 @@ export async function sendMessageBase(message: any, handlePartialData: (data: {
};
const chatResponse = await devChat.chat(parsedMessage.text, chatOptions, onData);
await handleTopic(parentHash!, message, chatResponse);
await handleTopic(message.parent_hash, message, chatResponse);
const responseText = await handlerResponseText(partialDataText, chatResponse);
if (responseText === undefined) {
return;