feat: wait fix

This commit is contained in:
手瓜一十雪
2024-05-29 00:00:48 +08:00
parent db57bf9d69
commit 406ac15c13
9 changed files with 126 additions and 90 deletions

View File

@@ -62,7 +62,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
MemberMap.set(webGroupMembers[i]?.uin, MemberData);
}
}
} else if (ob11Config.GroupLocalTimeRecord && ob11Config.GroupLocalTimeRecordList[0] === -1 || ob11Config.GroupLocalTimeRecordList.includes(payload.group_id)) {
} else if (ob11Config.GroupLocalTime.Record && ob11Config.GroupLocalTime.RecordList[0] === '-1' || ob11Config.GroupLocalTime.RecordList.includes(payload.group_id.toString())) {
const _sendAndJoinRember = await dbUtil.getLastSentTimeAndJoinTime(payload.group_id);
_sendAndJoinRember.forEach((element) => {
let MemberData = MemberMap.get(element.user_id);

View File

@@ -32,9 +32,10 @@ export interface OB11Config {
musicSignUrl: string;
reportSelfMessage: boolean;
token: string;
GroupLocalTimeRecord: boolean;
GroupLocalTimeRecordList: Array<number>;
GroupLocalTime: {
Record: boolean,
RecordList: Array<string>
},
read(): OB11Config;
save(config: OB11Config): void;
@@ -66,8 +67,10 @@ class Config extends ConfigBase<OB11Config> implements OB11Config {
musicSignUrl = '';
reportSelfMessage = false;
token = '';
GroupLocalTimeRecord = false;
GroupLocalTimeRecordList = [] as Array<number>;
GroupLocalTime = {
Record: false,
RecordList: [] as Array<string>
};
getConfigPath() {
return path.join(this.getConfigDir(), `onebot11_${selfInfo.uin}.json`);

View File

@@ -14,8 +14,7 @@ export class OB11GroupIncreaseEvent extends OB11GroupNoticeEvent {
this.user_id = userId;
this.sub_type = subType;
if((ob11Config.GroupLocalTimeRecord[0] == -1 || ob11Config.GroupLocalTimeRecord.includes(groupId)))
if(ob11Config.GroupLocalTime.Record && (ob11Config.GroupLocalTime.RecordList[0] == '-1' || ob11Config.GroupLocalTime.RecordList.includes(groupId.toString())))
dbUtil.insertJoinTime(groupId, userId, Math.floor(Date.now() / 1000))
}
}

View File

@@ -287,7 +287,7 @@ export class NapCatOnebot11 {
if (msg.post_type === 'message') {
logMessage(msg as OB11Message).then().catch(logError);
// 大概测试了一下10000个以内 includes 和 find 性能差距不大
if (msg.message_type == 'group' && msg.group_id && ob11Config.GroupLocalTimeRecord && (ob11Config.GroupLocalTimeRecordList[0] === -1 || ob11Config.GroupLocalTimeRecordList.find(gid=>gid == msg.group_id))) {
if (msg.message_type == 'group' && msg.group_id && ob11Config.GroupLocalTime.Record && (ob11Config.GroupLocalTime.RecordList[0] === '-1' || ob11Config.GroupLocalTime.RecordList.find(gid => gid == msg.group_id?.toString()))) {
dbUtil.insertLastSentTime(msg.group_id, msg.user_id, msg.time);
}
} else if (msg.post_type === 'notice') {