Compare commits

...

4 Commits

Author SHA1 Message Date
手瓜一十雪
c0f5d3bd2e release:2.2.15 2024-08-26 19:56:16 +08:00
手瓜一十雪
2a2d5382e1 Merge pull request #308 from LingLambda/main
规范了_send_group_notice接口参数命名,适当的规范了部分变量命名
2024-08-26 19:30:55 +08:00
ling
2e4986024c 规范了_send_group_notice接口参数命名,适当的规范了部分变量命名 2024-08-26 18:53:33 +08:00
手瓜一十雪
8a9c605dae release: 2.2.15 2024-08-26 18:02:21 +08:00
10 changed files with 19 additions and 15 deletions

View File

@@ -4,7 +4,7 @@
"name": "NapCatQQ",
"slug": "NapCat.Framework",
"description": "高性能的 OneBot 11 协议实现",
"version": "2.2.13",
"version": "2.2.15",
"icon": "./logo.png",
"authors": [
{

View File

@@ -2,7 +2,7 @@
"name": "napcat",
"private": true,
"type": "module",
"version": "2.2.13",
"version": "2.2.15",
"scripts": {
"build:framework": "vite build --mode framework",
"build:shell": "vite build --mode shell",

2
script/KillQQ.bat Normal file
View File

@@ -0,0 +1,2 @@
@echo off
taskkill /f /im QQ.exe

View File

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
import { fileURLToPath } from 'url';
import fs from 'fs';
export const napcat_version = '2.2.13';
export const napcat_version = '2.2.15';
export class NapCatPathWrapper {
binaryPath: string;

View File

@@ -11,7 +11,7 @@ const SchemaData = {
content: { type: 'string' },
image: { type: 'string' },
pinned: { type: ['number', 'string'] },
confirmRequired: { type: ['number', 'string'] },
confirm_required: { type: ['number', 'string'] },
},
required: ['group_id', 'content'],
} as const satisfies JSONSchema;
@@ -49,12 +49,12 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
}
UploadImage = ImageUploadResult.picInfo;
}
let Notice_Pinned = +(payload.pinned ?? 0);
let Notice_confirmRequired = +(payload.confirmRequired ?? 0);
const PublishGroupBulletinResult = await NTQQGroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, Notice_Pinned, Notice_confirmRequired);
let noticePinned = +(payload.pinned ?? 0);
let noticeConfirmRequired = +(payload.confirm_required ?? 0);
const publishGroupBulletinResult = await NTQQGroupApi.publishGroupBulletin(payload.group_id.toString(), payload.content, UploadImage, noticePinned, noticeConfirmRequired);
if (PublishGroupBulletinResult.result != 0) {
throw `设置群公告失败,错误信息:${PublishGroupBulletinResult.errMsg}`;
if (publishGroupBulletinResult.result != 0) {
throw `设置群公告失败,错误信息:${publishGroupBulletinResult.errMsg}`;
}
return null;
}

View File

@@ -142,7 +142,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
}
receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
const retdata = await this.actions.get(receiveData.action)
?.websocketHandle(receiveData.params, echo || '');
?.websocketHandle(receiveData.params, echo ?? '');
const packet = Object.assign({}, retdata);
this.checkStateAndReply<any>(packet);
} catch (e) {

View File

@@ -155,7 +155,7 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
return;
}
receiveData.params = (receiveData?.params) ? receiveData.params : {};//兼容类型验证
const retdata = await this.actions.get(receiveData.action)?.websocketHandle(receiveData.params, echo || '');
const retdata = await this.actions.get(receiveData.action)?.websocketHandle(receiveData.params, echo ?? '');
const packet = Object.assign({}, retdata);
this.checkStateAndReply<any>(packet, wsClient);
} catch (e) {

View File

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
SettingItem(
'<span id="napcat-update-title">Napcat</span>',
undefined,
SettingButton('V2.2.13', 'napcat-update-button', 'secondary'),
SettingButton('V2.2.15', 'napcat-update-button', 'secondary'),
),
]),
SettingList([

View File

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
SettingItem(
'<span id="napcat-update-title">Napcat</span>',
void 0,
SettingButton("V2.2.13", "napcat-update-button", "secondary")
SettingButton("V2.2.15", "napcat-update-button", "secondary")
)
]),
SettingList([

View File

@@ -20,9 +20,11 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') {
} else if (process.env.NAPCAT_BUILDSYS == 'win32') {
if (process.env.NAPCAT_BUILDARCH == 'x64') {
}
startScripts = ['./script/BootWay05.ps1', './script/dbghelp.dll'];
startScripts = ['./script/BootWay05.ps1', './script/dbghelp.dll',
'./script/BootWay05_init.bat', './script/BootWay05_run.bat', './script/BootWay05_run.utf8.bat', './script/KillQQ.bat'];
} else {
startScripts = ['./script/BootWay05.ps1', './script/dbghelp.dll'];
startScripts = ['./script/BootWay05.ps1', './script/dbghelp.dll',
'./script/BootWay05_init.bat', './script/BootWay05_run.bat', './script/BootWay05_run.utf8.bat', './script/KillQQ.bat'];
}
const FrameworkBaseConfigPlugin: PluginOption[] = [
// PreprocessorDirectives(),