From ff4e2f6d550b72f1d7d267d16cad4c4664df61da Mon Sep 17 00:00:00 2001 From: idranme <96647698+idranme@users.noreply.github.com> Date: Sun, 21 Jul 2024 14:59:38 +0000 Subject: [PATCH 1/4] fix: omit redundant attributes --- src/utils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/utils.ts b/src/utils.ts index d41672a..31a1115 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,4 @@ -import { h, hyphenate, Universal } from 'koishi' +import { h, hyphenate, Universal, omit } from 'koishi' import * as qface from 'qface' import { BaseBot, CQCode } from './bot' import * as OneBot from './types' @@ -77,25 +77,25 @@ export async function adaptMessage( image(attrs) { return h('img', { src: attrs.url || attrs.file, - ...attrs, + ...omit(attrs, ['url']), }) }, record(attrs) { return h('audio', { src: attrs.url || attrs.file, - ...attrs, + ...omit(attrs, ['url']), }) }, video(attrs) { return h('video', { src: attrs.url || attrs.file, - ...attrs, + ...omit(attrs, ['url']), }) }, file(attrs) { return h('file', { src: attrs.url || attrs.file, - ...attrs, + ...omit(attrs, ['url']), }) }, }) From 29183718f05d698798bfa8648448718dcb2975ea Mon Sep 17 00:00:00 2001 From: idranme <96647698+idranme@users.noreply.github.com> Date: Sun, 21 Jul 2024 15:35:50 +0000 Subject: [PATCH 2/4] fix --- src/utils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils.ts b/src/utils.ts index 31a1115..498e477 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -77,25 +77,25 @@ export async function adaptMessage( image(attrs) { return h('img', { src: attrs.url || attrs.file, - ...omit(attrs, ['url']), + ...omit(attrs, ['url', 'file']), }) }, record(attrs) { return h('audio', { src: attrs.url || attrs.file, - ...omit(attrs, ['url']), + ...omit(attrs, ['url', 'file']), }) }, video(attrs) { return h('video', { src: attrs.url || attrs.file, - ...omit(attrs, ['url']), + ...omit(attrs, ['url', 'file']), }) }, file(attrs) { return h('file', { src: attrs.url || attrs.file, - ...omit(attrs, ['url']), + ...omit(attrs, ['url', 'file']), }) }, }) From 65a3cdb7543ba26da1c6d52bca2701d5633e0777 Mon Sep 17 00:00:00 2001 From: idranme Date: Sun, 21 Jul 2024 23:42:02 +0800 Subject: [PATCH 3/4] Revert "fix" This reverts commit 29183718f05d698798bfa8648448718dcb2975ea. --- src/utils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils.ts b/src/utils.ts index 498e477..31a1115 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -77,25 +77,25 @@ export async function adaptMessage( image(attrs) { return h('img', { src: attrs.url || attrs.file, - ...omit(attrs, ['url', 'file']), + ...omit(attrs, ['url']), }) }, record(attrs) { return h('audio', { src: attrs.url || attrs.file, - ...omit(attrs, ['url', 'file']), + ...omit(attrs, ['url']), }) }, video(attrs) { return h('video', { src: attrs.url || attrs.file, - ...omit(attrs, ['url', 'file']), + ...omit(attrs, ['url']), }) }, file(attrs) { return h('file', { src: attrs.url || attrs.file, - ...omit(attrs, ['url', 'file']), + ...omit(attrs, ['url']), }) }, }) From d643a1c99ae04d1148fbc81633dd1c91d5365a35 Mon Sep 17 00:00:00 2001 From: Shigma Date: Thu, 8 Aug 2024 19:46:37 +0800 Subject: [PATCH 4/4] Update src/utils.ts --- src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.ts b/src/utils.ts index 31a1115..c1d4cda 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,4 @@ -import { h, hyphenate, Universal, omit } from 'koishi' +import { h, hyphenate, omit, Universal } from 'koishi' import * as qface from 'qface' import { BaseBot, CQCode } from './bot' import * as OneBot from './types'