MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 适配官网conversation API变动

Browse source
This commit is contained in:
ikechan8370 2023-03-11 00:56:55 +08:00
parent ab0e80e0e6
commit 89d3bb52dd
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
utils/conversation.js
View file

@ -19,7 +19,7 @@ export async function getConversations (qq = '', fetchFn = fetch) {
} }
let conversations let conversations
try { try {
conversations = JSON.parse(json) conversations = JSON.parse(json).body
} catch (e) { } catch (e) {
throw new Error(json) throw new Error(json)
} }
@ -33,7 +33,7 @@ export async function getConversations (qq = '', fetchFn = fetch) {
map[item.id] = cachedConversationLastMessage map[item.id] = cachedConversationLastMessage
} else { } else {
// 缓存中没有，就去查官方api // 缓存中没有，就去查官方api
let conversationDetailResponse = await fetchFn(`${Config.apiBaseUrl}/api/conversation/${item.id}`, { let conversationDetailResponse = await fetchFn(`${Config.apiBaseUrl}/conversation/${item.id}`, {
method: 'GET', method: 'GET',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -44,16 +44,21 @@ export async function getConversations (qq = '', fetchFn = fetch) {
if (Config.debug) { if (Config.debug) {
logger.mark('conversation detail for conversation ' + item.id, conversationDetail) logger.mark('conversation detail for conversation ' + item.id, conversationDetail)
} }
conversationDetail = JSON.parse(conversationDetail) try {
conversationDetail = JSON.parse(conversationDetail).body
} catch (err) {
logger.warn('跳过')
continue
}
let messages = Object.values(conversationDetail.mapping || {}) let messages = Object.values(conversationDetail.mapping || {})
messages = messages messages = messages
.filter(message => message.message) .filter(message => message.message)
.map(messages => messages.message) .map(messages => messages.message)
let messagesAssistant = messages.filter(messages => messages.role === 'assistant') let messagesAssistant = messages.filter(messages => messages.author.role === 'assistant')
.sort((a, b) => b.create_time - a.create_time) .sort((a, b) => b.create_time - a.create_time)
let messagesUser = messages.filter(messages => messages.role === 'user') let messagesUser = messages.filter(messages => messages.author.role === 'user')
.sort((a, b) => b.create_time - a.create_time) .sort((a, b) => b.create_time - a.create_time)
await redis.set(`CHATGPT:CONVERSATION_LENGTH:${item.id}`, messagesUser?.length || 0) await redis.set(`CHATGPT:CONVERSATION_LENGTH:${item.id}`, messagesUser?.length || 0)
let lastMessage = null let lastMessage = null
@ -101,7 +106,7 @@ export async function getLatestMessageIdByConversationId (conversationId, fetchF
if (!accessToken) { if (!accessToken) {
throw new Error('未绑定ChatGPT AccessToken，请使用#chatgpt设置token命令绑定token') throw new Error('未绑定ChatGPT AccessToken，请使用#chatgpt设置token命令绑定token')
} }
let conversationDetailResponse = await fetchFn(`${Config.apiBaseUrl}/api/conversation/${conversationId}`, { let conversationDetailResponse = await fetchFn(`${Config.apiBaseUrl}/conversation/${conversationId}`, {
method: 'GET', method: 'GET',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@ -112,12 +117,12 @@ export async function getLatestMessageIdByConversationId (conversationId, fetchF
if (Config.debug) { if (Config.debug) {
logger.mark('conversation detail for conversation ' + conversationId, conversationDetail) logger.mark('conversation detail for conversation ' + conversationId, conversationDetail)
} }
conversationDetail = JSON.parse(conversationDetail) conversationDetail = JSON.parse(conversationDetail).body
let messages = Object.values(conversationDetail.mapping) let messages = Object.values(conversationDetail.mapping)
messages = messages messages = messages
.filter(message => message.message) .filter(message => message.message)
.map(messages => messages.message) .map(messages => messages.message)
.filter(messages => messages.role === 'assistant') .filter(messages => messages.author.role === 'assistant')
.sort((a, b) => b.create_time - a.create_time) .sort((a, b) => b.create_time - a.create_time)
await redis.set(`CHATGPT:CONVERSATION_LAST_MESSAGE_ID:${conversationId}`, messages[0].id) await redis.set(`CHATGPT:CONVERSATION_LAST_MESSAGE_ID:${conversationId}`, messages[0].id)
return messages[0].id return messages[0].id
@ -129,7 +134,7 @@ export async function deleteConversation (conversationId, fetchFn = fetch) {
if (!accessToken) { if (!accessToken) {
throw new Error('未绑定ChatGPT AccessToken，请使用#chatgpt设置token命令绑定token') throw new Error('未绑定ChatGPT AccessToken，请使用#chatgpt设置token命令绑定token')
} }
let response = await fetchFn(`${Config.apiBaseUrl}/api/conversation/${conversationId}`, { let response = await fetchFn(`${Config.apiBaseUrl}/conversation/${conversationId}`, {
method: 'PATCH', method: 'PATCH',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',