Northern_Lights/NapCatQQ
0
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-13 08:20:27 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refactor: kill any (#475)

Browse Source 
* refactor: kill any stage 1

* refactor: kill any stage 2

* refactor: kill any stage 3
This commit is contained in:
pk5ls20
2024-10-30 09:10:30 +08:00
committed by GitHub
parent 4d2fccdfb4
commit 9fa6083bed
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/onebot/action/extends/SetQQAvatar.ts
View File

@@ -38,11 +38,10 @@ export default class SetAvatar extends BaseAction<Payload, null> {
throw `头像${payload.file}设置失败,api无返回`;
}
// log(`头像设置返回：${JSON.stringify(ret)}`)
// @ts-ignore
if (ret['result'] == 1004022) {
if (ret.result as number == 1004022) {
throw `头像${payload.file}设置失败，文件可能不是图片格式`;
} else if (ret['result'] != 0) {
throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`;
} else if (ret.result != 0) {
throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`;
}
} else {
fs.unlink(path, () => { });

8
src/onebot/action/go-cqhttp/SetGroupPortrait.ts
View File

@@ -31,15 +31,15 @@ export default class SetGroupPortrait extends BaseAction<Payload, any> {
}
if (path) {
await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path) as any;
const ret = await this.core.apis.GroupApi.setGroupAvatar(payload.group_id.toString(), path);
fs.unlink(path, () => { });
if (!ret) {
throw `头像${payload.file}设置失败,api无返回`;
}
if (ret['result'] == 1004022) {
if (ret.result as number == 1004022) {
throw `头像${payload.file}设置失败，文件可能不是图片格式或权限不足`;
} else if (ret['result'] != 0) {
throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`;
} else if (ret.result != 0) {
throw `头像${payload.file}设置失败,未知的错误,${ret.result}:${ret.errMsg}`;
}
return ret;
} else {

6
src/onebot/action/msg/SendMsg.ts
View File

@@ -236,12 +236,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
message: RawMessage | null,
res_id?: string
}> {
let returnMsg: RawMessage | undefined, res_id: string | undefined;
const uploadReturnData = await this.uploadForwardedNodesPacket(msgPeer, messageNodes, source, news, summary, prompt);
res_id = uploadReturnData?.res_id;
const res_id = uploadReturnData?.res_id;
const finallySendElements = uploadReturnData?.finallySendElements;
if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined);
const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined);
return { message: returnMsg ?? null, res_id };
}
@@ -276,7 +275,6 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
logger.logError.bind(this.core.context.logger)('子消息中包含非node消息 跳过不合法部分');
continue;
}
// @ts-ignore
const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
if (nodeMsg) {
nodeMsgIds.push(nodeMsg.message!.msgId);

28
src/onebot/api/msg.ts
View File

@@ -24,7 +24,6 @@ import {
OB11MessageData,
OB11MessageDataType,
OB11MessageFileBase,
OB11MessageForward,
} from '@/onebot';
import { OB11Entities } from '@/onebot/entities';
import { EventType } from '@/onebot/event/OB11BaseEvent';
@@ -327,11 +326,11 @@ export class OneBotMsgApi {
},
multiForwardMsgElement: async (_, msg) => {
const message_data: OB11MessageForward = {
data: {} as any,
type: OB11MessageDataType.forward,
};
message_data.data.id = msg.msgId;
// const message_data: OB11MessageForward = {
// data: {} as any,
// type: OB11MessageDataType.forward,
// };
// message_data.data.id = msg.msgId;
const parentMsgPeer = msg.parentMsgPeer ?? {
chatType: msg.chatType,
guildId: '',
@@ -743,9 +742,12 @@ export class OneBotMsgApi {
async (element) => {
for (const key in element) {
if (keyCanBeParsed(key, this.rawToOb11Converters) && element[key]) {
const parsedElement = await this.rawToOb11Converters[key]?.(
// eslint-disable-next-line
// @ts-ignore
const converters = this.rawToOb11Converters[key] as (
element: Exclude<MessageElement[keyof RawToOb11Converters], null | undefined>,
msg: RawMessage,
elementWrapper: MessageElement,
) => PromiseLike<OB11MessageData | null>;
const parsedElement = await converters?.(
element[key],
msg,
element,
@@ -794,9 +796,11 @@ export class OneBotMsgApi {
if (ignoreTypes.includes(sendMsg.type)) {
continue;
}
const callResult = this.ob11ToRawConverters[sendMsg.type](
// eslint-disable-next-line
// @ts-ignore
const converter = this.ob11ToRawConverters[sendMsg.type] as (
sendMsg: Extract<OB11MessageData, { type: OB11MessageData['type'] }>,
context: MessageContext,
) => Promise<SendMessageElement | undefined>;
const callResult = converter(
sendMsg,
{ peer, deleteAfterSentFiles },
)?.catch(undefined);

6
src/onebot/cqcode.ts
View File

@@ -68,13 +68,13 @@ export function encodeCQCode(data: OB11MessageData) {
let result = '[CQ:' + data.type;
for (const name in data.data) {
const value = (data.data as any)[name];
const value = (data.data as Record<string, unknown>)[name];
if (value === undefined) {
continue;
}
try {
const text = value.toString();
result += `,${name}=${CQCodeEscape(text)}`;
const text = value?.toString();
if (text) result += `,${name}=${CQCodeEscape(text)}`;
} catch (error) {
// If it can't be converted, skip this name-value pair
}

4
src/onebot/index.ts
View File

@@ -341,7 +341,7 @@ export class NapCatOneBot11Adapter {
};
this.context.session.getMsgService().addKernelMsgListener(
proxiedListenerOf(msgListener, this.context.logger) as any,
proxiedListenerOf(msgListener, this.context.logger),
);
}
@@ -370,7 +370,7 @@ export class NapCatOneBot11Adapter {
};
this.context.session.getBuddyService().addKernelBuddyListener(
proxiedListenerOf(buddyListener, this.context.logger) as any,
proxiedListenerOf(buddyListener, this.context.logger),
);
}

6
src/onebot/network/passive-http.ts
View File

@@ -64,9 +64,9 @@ export class OB11PassiveHttpAdapter implements IOB11NetworkAdapter {
});
this.app.use((req, res, next) => this.authorize(this.token, req, res, next));
// @ts-ignore
this.app.use((req, res) => this.handleRequest(req, res));
this.app.use(async (req, res, _) => {
await this.handleRequest(req, res);
});
this.server.listen(this.port, () => {
this.core.context.logger.log(`[OneBot] [HTTP Server Adapter] Start On Port ${this.port}`);
});