diff --git a/utils/tools/SendPictureTool.js b/utils/tools/SendPictureTool.js index 2af3bbc..b521caf 100644 --- a/utils/tools/SendPictureTool.js +++ b/utils/tools/SendPictureTool.js @@ -41,18 +41,32 @@ export class SendPictureTool extends AbstractTool { } catch (err) { groupList = e.bot.gl } + let errs = [] try { if (groupList.get(target)) { let group = await e.bot.pickGroup(target) - await group.sendMsg(pictures) - return 'picture has been sent to group' + target + for (let pic of pictures) { + try { + await group.sendMsg(pic) + } catch (err) { + errs.push(pic.url) + } + } + // await group.sendMsg(pictures) + return 'picture has been sent to group' + target + errs.length > 0 ? `, but some pictures failed to send (${errs.join('、')})` : '' } else { 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 + for (let pic of pictures) { + try { + await user.sendMsg(pictures) + } catch (err) { + errs.push(pic.url) + } + } + return 'picture has been sent to user' + target + errs.length > 0 ? `, but some pictures failed to send (${errs.join('、')})` : '' } } catch (err) { return `failed to send pictures, error: ${JSON.stringify(err)}`