细节优化

This commit is contained in:
🌌 2023-07-27 08:37:02 +08:00
parent 1032d5c4c4
commit f20abbe767
1 changed files with 9 additions and 9 deletions

View File

@ -154,7 +154,7 @@ export class add extends plugin {
if (!this.e.msg?.includes("#结束添加")) { if (!this.e.msg?.includes("#结束添加")) {
/** 添加内容 */ /** 添加内容 */
for (const i of this.e.message) { for (const i of this.e.message) {
if (i.url) i.file = await this.saveFile(i.url) if (i.url) i.file = await this.saveFile(i)
if (i.type == "at" && i.qq == this.e.self_id) continue if (i.type == "at" && i.qq == this.e.self_id) continue
context.message.push(i) context.message.push(i)
} }
@ -204,22 +204,22 @@ export class add extends plugin {
} }
async fileType(data) { async fileType(data) {
const file = {} const file = { name: `${this.group_id}/${data.type}/${Date.now()}` }
try { try {
file.url = data.replace(/^base64:\/\/.*/, "base64://...") file.url = data.url.replace(/^base64:\/\/.*/, "base64://...")
file.buffer = await this.makeBuffer(data) file.buffer = await this.makeBuffer(data.url)
file.type = await fileTypeFromBuffer(file.buffer) file.type = await fileTypeFromBuffer(file.buffer)
file.name = `${this.group_id}/${Date.now()}.${file.type.ext}` file.name = `${file.name}.${file.type.ext}`
} catch (err) { } catch (err) {
logger.error(`文件类型检测错误:${logger.red(err)}`) logger.error(`文件类型检测错误:${logger.red(err)}`)
file.name = `${this.group_id}/${Date.now()}-${path.basename(file.url)}` file.name = `${file.name}-${path.basename(data.file || data.url)}`
} }
return file return file
} }
async saveFile(url) { async saveFile(data) {
const file = await this.fileType(url) const file = await this.fileType(data)
if (file.name && Buffer.isBuffer(file.buffer) && common.mkdirs(`${this.path}${this.group_id}`)) { if (file.name && Buffer.isBuffer(file.buffer) && common.mkdirs(path.dirname(`${this.path}${file.name}`))) {
fs.writeFileSync(`${this.path}${file.name}`, file.buffer) fs.writeFileSync(`${this.path}${file.name}`, file.buffer)
return file.name return file.name
} }