diff --git a/manifest.json b/manifest.json index f19c3b1c..a94b3930 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCat", "slug": "NapCat", "description": "现代化的 OneBot 11 协议实现", - "version": "2.0.13", + "version": "2.0.14", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index c827d223..851ad570 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.0.13", + "version": "2.0.14", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/framework/napcat.ts b/src/common/framework/napcat.ts index 19c1056e..8eaf9d96 100644 --- a/src/common/framework/napcat.ts +++ b/src/common/framework/napcat.ts @@ -2,7 +2,7 @@ import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import fs from 'fs'; -export const napcat_version = '2.0.13'; +export const napcat_version = '2.0.14'; export class NapCatPathWrapper { binaryPath: string; diff --git a/src/framework/renderer.js b/src/framework/renderer.js index 296a1daf..114622ba 100644 --- a/src/framework/renderer.js +++ b/src/framework/renderer.js @@ -1,14 +1,38 @@ + export const onSettingWindowCreated = async (view) => { - view.style.width = "100%"; - view.style.height = "100%"; - //添加iframe - const iframe = document.createElement("iframe"); - iframe.src = await window.napcat.getWebUiUrl(); - iframe.width = "100%"; - iframe.height = "100%"; - iframe.style.border = "none"; - //去掉iframe滚动条 - //iframe.scrolling = "no"; - //有滚动条何尝不是一种美 - view.appendChild(iframe); + + // view.style.width = "100%"; + // view.style.height = "100%"; + // //添加iframe + // const iframe = document.createElement("iframe"); + // iframe.src = await window.napcat.getWebUiUrl(); + // iframe.width = "100%"; + // iframe.height = "100%"; + // iframe.style.border = "none"; + // //去掉iframe滚动条 + // //iframe.scrolling = "no"; + // //有滚动条何尝不是一种美 + // view.appendChild(iframe); + let webui = await window.napcat.getWebUiUrl() + let panel = ` + + + + + 打开配置页面 + + +
+ WebUi +
+
+
+
+
+ `; + view.innerHTML = panel; + view.querySelector(".nc_openwebui").addEventListener("click", () => { + window.open(webui, "_blank"); + }); + view.querySelector(".nc_webui").innerText = webui; }; \ No newline at end of file diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index a95c5be8..cbeba0d2 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -69,7 +69,7 @@ class GetGroupMemberInfo extends BaseAction { } } } else { - // Mlikiowa V2.0.13 Refactor Todo + // Mlikiowa V2.0.14 Refactor Todo // retMember.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString()); // retMember.join_time = parseInt((await getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString()); } diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 6c2cc180..2ba5ea74 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -83,7 +83,7 @@ class GetGroupMemberList extends BaseAction { } } } else { - // Mlikiowa V2.0.13 Refactor Todo + // Mlikiowa V2.0.14 Refactor Todo // _groupMembers.forEach(async item => { // item.last_sent_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.lastSpeakTime || date.toString()); // item.join_time = parseInt((await getGroupMember(payload.group_id.toString(), item.user_id))?.joinTime || date.toString()); diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index 84ea8702..5e99d076 100644 --- a/src/onebot/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts @@ -56,7 +56,7 @@ const _handlers: { if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员'); // then the qq is a group member - // Mlikiowa V2.0.13 Refactor Todo + // Mlikiowa V2.0.14 Refactor Todo const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); @@ -161,7 +161,7 @@ const _handlers: { } else { postData = data; } - // Mlikiowa V2.0.13 Refactor Todo + // Mlikiowa V2.0.14 Refactor Todo const signUrl = obContext.configLoader.configData.musicSignUrl; if (!signUrl) { if (data.type === 'qq') { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index aef3ddc2..b23713d4 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -417,7 +417,7 @@ export class OB11Constructor { return; } //log("group msg", msg); - // Mlikiowa V2.0.13 Refactor Todo + // Mlikiowa V2.0.14 Refactor Todo // if (msg.senderUin && msg.senderUin !== '0') { // const member = await getGroupMember(msg.peerUid, msg.senderUin); // if (member && member.cardName !== msg.sendMemberName) { diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 7d5ca5c6..5171c966 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.0.13', 'napcat-update-button', 'secondary'), + SettingButton('V2.0.14', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index ca214af8..b6637d97 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.0.13", "napcat-update-button", "secondary") + SettingButton("V2.0.14", "napcat-update-button", "secondary") ) ]), SettingList([