style:lint

This commit is contained in:
手瓜一十雪 2024-08-06 11:12:25 +08:00
parent 8fa6a12a7c
commit 7da8ea5e99
13 changed files with 72 additions and 64 deletions

View File

@ -6,15 +6,15 @@ import AppidTable from '@/core/external/appid.json';
import { log } from './log'; import { log } from './log';
//基础目录获取 //基础目录获取
export let QQMainPath = process.execPath; export const QQMainPath = process.execPath;
export let QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json'); export const QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
export let QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath); export const QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
//基础信息获取 无快更则启用默认模板填充 //基础信息获取 无快更则启用默认模板填充
export let isQuickUpdate: boolean = !!QQVersionConfigPath; export const isQuickUpdate: boolean = !!QQVersionConfigPath;
export let QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo(); export const QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
export let QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString()); export const QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
export let { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2(); export const { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
//基础函数 //基础函数
export function getQQBuildStr() { export function getQQBuildStr() {
@ -31,9 +31,9 @@ export function getQUAInternal() {
return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`; return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`;
} }
export function getAppidV2(): { appid: string, qua: string } { export function getAppidV2(): { appid: string, qua: string } {
let appidTbale = AppidTable as unknown as QQAppidTableType; const appidTbale = AppidTable as unknown as QQAppidTableType;
try { try {
let data = appidTbale[getFullQQVesion()]; const data = appidTbale[getFullQQVesion()];
if (data) { if (data) {
return data; return data;
} }

View File

@ -195,7 +195,7 @@ export async function uri2local(UriOrPath: string, fileName: string | null = nul
let url = null; let url = null;
//区分path和uri //区分path和uri
try { try {
if (fs.existsSync(UriOrPath)) url = new URL("file://" + UriOrPath); if (fs.existsSync(UriOrPath)) url = new URL('file://' + UriOrPath);
} catch (error: any) { } } catch (error: any) { }
try { try {
url = new URL(UriOrPath); url = new URL(UriOrPath);

View File

@ -360,12 +360,12 @@ export async function promisePipeline(promises: Promise<any>[], callback: (resul
callbackCalled = callback(result); callbackCalled = callback(result);
} }
} catch (error) { } catch (error) {
console.error("Error in promise pipeline:", error); console.error('Error in promise pipeline:', error);
} }
} }
} }
export function getQQVersionConfigPath(exePath: string = ""): string | undefined { export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
let configVersionInfoPath; let configVersionInfoPath;
if (os.platform() !== 'linux') { if (os.platform() !== 'linux') {
configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json'); configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');

View File

@ -11,6 +11,10 @@
"appid": 537237950, "appid": 537237950,
"qua": "V1_LNX_NQ_3.2.12_26702_GW_B" "qua": "V1_LNX_NQ_3.2.12_26702_GW_B"
}, },
"3.2.12-26740": {
"appid": 537237950,
"qua": "V1_WIN_NQ_9.9.15_26740_GW_B"
},
"9.9.11-24815": { "9.9.11-24815": {
"appid": 537226656, "appid": 537226656,
"qua": "V1_WIN_NQ_9.9.11_24815_GW_B" "qua": "V1_WIN_NQ_9.9.11_24815_GW_B"
@ -38,5 +42,9 @@
"9.9.15-26702": { "9.9.15-26702": {
"appid": 537237765, "appid": 537237765,
"qua": "V1_WIN_NQ_9.9.15_26702_GW_B" "qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
},
"9.9.15-26740": {
"appid": 537237765,
"qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
} }
} }

View File

@ -23,9 +23,9 @@ export class FetchEmojioLike extends BaseAction<Payload, any> {
actionName = ActionName.FetchEmojioLike; actionName = ActionName.FetchEmojioLike;
PayloadSchema = SchemaData; PayloadSchema = SchemaData;
protected async _handle(payload: Payload) { protected async _handle(payload: Payload) {
let msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
if(!msgIdPeer) throw new Error('消息不存在'); if(!msgIdPeer) throw new Error('消息不存在');
let msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0]; const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
const ret = await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer,msg.msgSeq,payload.emojiId,payload.emojiType,payload.count); const ret = await NTQQMsgApi.getMsgEmojiLikesList(msgIdPeer.Peer,msg.msgSeq,payload.emojiId,payload.emojiType,payload.count);
return ret; return ret;
} }

View File

@ -19,7 +19,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
actionName = ActionName.GetGroupList; actionName = ActionName.GetGroupList;
PayloadSchema = SchemaData; PayloadSchema = SchemaData;
protected async _handle(payload: Payload) { protected async _handle(payload: Payload) {
let groupList: Group[] = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true'); const groupList: Group[] = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
return OB11Constructor.groups(groupList); return OB11Constructor.groups(groupList);
} }
} }

View File

@ -26,11 +26,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
PayloadSchema = SchemaData; PayloadSchema = SchemaData;
protected async _handle(payload: Payload) { protected async _handle(payload: Payload) {
const isNocache = payload.no_cache == true || payload.no_cache === 'true'; const isNocache = payload.no_cache == true || payload.no_cache === 'true';
let uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
if (!uid) { if (!uid) {
throw (`Uin2Uid Error ${payload.user_id}不存在`); throw (`Uin2Uid Error ${payload.user_id}不存在`);
} }
let member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache); const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
if (!member) { if (!member) {
throw (`群(${payload.group_id})成员${payload.user_id}不存在`); throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
} }
@ -44,7 +44,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
const date = Math.round(Date.now() / 1000); const date = Math.round(Date.now() / 1000);
const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
if (!requireMinNTQQBuild('26702')) { if (!requireMinNTQQBuild('26702')) {
let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache); const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
let isPrivilege = false; let isPrivilege = false;
if (SelfInfoInGroup) { if (SelfInfoInGroup) {
isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4; isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4;

View File

@ -28,7 +28,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
PayloadSchema = SchemaData; PayloadSchema = SchemaData;
protected async _handle(payload: Payload) { protected async _handle(payload: Payload) {
if (requireMinNTQQBuild('26702')) { if (requireMinNTQQBuild('26702')) {
let V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true'); const V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
if (V2Data) { if (V2Data) {
return OB11Constructor.groupMember(payload.group_id.toString(), V2Data); return OB11Constructor.groupMember(payload.group_id.toString(), V2Data);
} else { } else {

View File

@ -30,7 +30,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
if (!group) { if (!group) {
throw (`${payload.group_id}不存在`); throw (`${payload.group_id}不存在`);
} }
let groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString()); const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
let _groupMembers = Array.from(groupMembers.values()) let _groupMembers = Array.from(groupMembers.values())
.map(item => { return OB11Constructor.groupMember(group.groupCode, item); }); .map(item => { return OB11Constructor.groupMember(group.groupCode, item); });

View File

@ -103,5 +103,5 @@ export enum ActionName {
FetchCustomFace = 'fetch_custom_face', FetchCustomFace = 'fetch_custom_face',
GOCQHTTP_UploadPrivateFile = 'upload_private_file', GOCQHTTP_UploadPrivateFile = 'upload_private_file',
TestApi01 = 'test_api_01', TestApi01 = 'test_api_01',
FetchEmojioLike = "fetch_emoji_like" FetchEmojioLike = 'fetch_emoji_like'
} }

View File

@ -18,12 +18,12 @@ export default class GetRecentContact extends BaseAction<Payload, any> {
actionName = ActionName.GetRecentContact; actionName = ActionName.GetRecentContact;
PayloadSchema = SchemaData; PayloadSchema = SchemaData;
protected async _handle(payload: Payload) { protected async _handle(payload: Payload) {
let ret = await NTQQUserApi.getRecentContactListSnapShot(parseInt((payload.count || 10).toString())); const ret = await NTQQUserApi.getRecentContactListSnapShot(parseInt((payload.count || 10).toString()));
let data = await Promise.all(ret.info.changedList.map(async (t) => { const data = await Promise.all(ret.info.changedList.map(async (t) => {
let FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]); const FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]);
if (FastMsg.msgList.length > 0) { if (FastMsg.msgList.length > 0) {
//扩展ret.info.changedList //扩展ret.info.changedList
let lastestMsg = await OB11Constructor.message(FastMsg.msgList[0]); const lastestMsg = await OB11Constructor.message(FastMsg.msgList[0]);
return { return {
lastestMsg: lastestMsg, lastestMsg: lastestMsg,
peerUin: t.peerUin, peerUin: t.peerUin,

View File

@ -11,7 +11,7 @@ class OB11HTTPServer extends HttpServerBase {
name = 'OneBot V11 server'; name = 'OneBot V11 server';
handleFailed(res: Response, payload: any, e: Error) { handleFailed(res: Response, payload: any, e: Error) {
res.send(OB11Response.error(e?.stack?.toString() || e.message || "Error Handle", 200)); res.send(OB11Response.error(e?.stack?.toString() || e.message || 'Error Handle', 200));
} }
protected listen(port: number, host: string) { protected listen(port: number, host: string) {