Merge pull request #7 from ikechan8370/v2

up
This commit is contained in:
ycxom 2025-02-12 15:59:33 +08:00 committed by GitHub
commit 97d807f3cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 39 additions and 17 deletions

View file

@ -5,7 +5,7 @@ export async function getChatHistoryGroup (e, num) {
// if (e.adapter === 'shamrock') {
// return await e.group.getChatHistory(0, num, false)
// } else {
let latestChats = await e.group.getChatHistory(0, 1)
let latestChats = await e.group.getChatHistory(e.seq || e.message_id, 1)
if (latestChats.length > 0) {
let latestChat = latestChats[0]
if (latestChat) {

View file

@ -37,8 +37,11 @@ export class SendDiceTool extends AbstractTool {
await group.sendMsg(segment.dice())
}
} else {
let friend = await e.bot.pickFriend(target)
await friend.sendMsg(segment.dice())
let user = e.bot.pickUser(target)
if (e.group_id) {
user = user.asMember(e.group_id)
}
await user.sendMsg(segment.dice())
}
if (num === 5) {
logger.warn(1)

View file

@ -37,7 +37,11 @@ export class SendMessageToSpecificGroupOrUserTool extends AbstractTool {
await group.sendMsg(await convertFaces(msg, true, e))
return 'msg has been sent to group' + target
} else {
let user = await e.bot.pickFriend(target)
let user = e.bot.pickUser(target)
if (e.group_id) {
user = user.asMember(e.group_id)
}
// let user = await e.bot.pickFriend(target)
await user.sendMsg(msg)
return 'msg has been sent to user' + target
}

View file

@ -47,7 +47,10 @@ export class SendPictureTool extends AbstractTool {
await group.sendMsg(pictures)
return 'picture has been sent to group' + target
} else {
let user = await e.bot.pickFriend(target)
let user = e.bot.pickUser(target)
if (e.group_id) {
user = user.asMember(e.group_id)
}
await user.sendMsg(pictures)
return 'picture has been sent to user' + target
}

View file

@ -30,8 +30,11 @@ export class SendRPSTool extends AbstractTool {
let group = await e.bot.pickGroup(target, true)
await group.sendMsg(segment.rps(num))
} else {
let friend = await e.bot.pickFriend(target)
await friend.sendMsg(segment.rps(num))
let user = e.bot.pickUser(target)
if (e.group_id) {
user = user.asMember(e.group_id)
}
await user.sendMsg(segment.rps(num))
}
}

View file

@ -8,7 +8,7 @@ class Tokenizer {
throw new Error('no valid group id')
}
let group = e.bot.pickGroup(groupId, true)
let latestChat = await group.getChatHistory(0, 1)
let latestChat = await group.getChatHistory(undefined, 1)
let seq = latestChat[0].seq
let chats = latestChat
function compareByTime (a, b) {