mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-12-19 05:05:44 +08:00
fix: Group Into Member Info
This commit is contained in:
parent
57bfc5c73a
commit
b866cfc03c
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,11 +1,10 @@
|
|||||||
# Logs
|
|
||||||
|
|
||||||
# Develop
|
# Develop
|
||||||
node_modules/
|
node_modules/
|
||||||
package-lock.json
|
package-lock.json
|
||||||
out/
|
out/
|
||||||
dist/
|
dist/
|
||||||
src/core.lib/common/
|
src/core.lib/common/
|
||||||
|
test
|
||||||
|
|
||||||
# Editor
|
# Editor
|
||||||
.vscode/*
|
.vscode/*
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import { ob11Config } from '@/onebot11/config';
|
|||||||
import { httpHeart, ob11HTTPServer } from '@/onebot11/server/http';
|
import { httpHeart, ob11HTTPServer } from '@/onebot11/server/http';
|
||||||
import { ob11WebsocketServer } from '@/onebot11/server/ws/WebsocketServer';
|
import { ob11WebsocketServer } from '@/onebot11/server/ws/WebsocketServer';
|
||||||
import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
|
import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
|
||||||
import { friendRequests, getFriend, getGroup, getGroupMember, groupNotifies, selfInfo } from '@/core/data';
|
import { friendRequests, getFriend, getGroup, getGroupMember, groupNotifies, selfInfo, uid2UinMap } from '@/core/data';
|
||||||
import { dbUtil } from '@/core/utils/db';
|
import { dbUtil } from '@/core/utils/db';
|
||||||
import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '../core/src/listeners';
|
import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '../core/src/listeners';
|
||||||
import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
|
import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
|
||||||
@ -62,7 +62,7 @@ export class NapCatOnebot11 {
|
|||||||
if (ob11Config.enableWsReverse) {
|
if (ob11Config.enableWsReverse) {
|
||||||
ob11ReverseWebsockets.start();
|
ob11ReverseWebsockets.start();
|
||||||
}
|
}
|
||||||
if (ob11Config.enableHttpHeart){
|
if (ob11Config.enableHttpHeart) {
|
||||||
// 启动http心跳
|
// 启动http心跳
|
||||||
httpHeart.start();
|
httpHeart.start();
|
||||||
}
|
}
|
||||||
@ -126,8 +126,14 @@ export class NapCatOnebot11 {
|
|||||||
|
|
||||||
// GroupListener
|
// GroupListener
|
||||||
const groupListener = new GroupListener();
|
const groupListener = new GroupListener();
|
||||||
groupListener.onGroupNotifiesUpdated = (doubt, notifies) => {
|
groupListener.onGroupNotifiesUpdated = async (doubt, notifies) => {
|
||||||
// console.log('ob11 onGroupNotifiesUpdated', notifies);
|
for (let i = 0; i < notifies.length; i++) {
|
||||||
|
let UserInfo_User1 = await NTQQUserApi.getUserDetailInfo(notifies[i].user1.uid);
|
||||||
|
let UserInfo_User2 = await NTQQUserApi.getUserDetailInfo(notifies[i].user2.uid);
|
||||||
|
uid2UinMap[UserInfo_User1.uid] = UserInfo_User1.uin;
|
||||||
|
uid2UinMap[UserInfo_User2.uid] = UserInfo_User2.uin;
|
||||||
|
}
|
||||||
|
//console.log('ob11 onGroupNotifiesUpdated', notifies[0], notifies[0].group, notifies[0].user1, notifies[0].user2);
|
||||||
this.postGroupNotifies(notifies).then().catch(e => logError('postGroupNotifies error: ', e));
|
this.postGroupNotifies(notifies).then().catch(e => logError('postGroupNotifies error: ', e));
|
||||||
};
|
};
|
||||||
groupListener.onJoinGroupNotify = (...notify) => {
|
groupListener.onJoinGroupNotify = (...notify) => {
|
||||||
@ -181,8 +187,8 @@ export class NapCatOnebot11 {
|
|||||||
postOB11Event(groupEvent);
|
postOB11Event(groupEvent);
|
||||||
}
|
}
|
||||||
}).catch(e => logError('constructGroupEvent error: ', e));
|
}).catch(e => logError('constructGroupEvent error: ', e));
|
||||||
OB11Constructor.FriendAddEvent(message).then(friendAddEvent=>{
|
OB11Constructor.FriendAddEvent(message).then(friendAddEvent => {
|
||||||
if(friendAddEvent){
|
if (friendAddEvent) {
|
||||||
postOB11Event(friendAddEvent);
|
postOB11Event(friendAddEvent);
|
||||||
}
|
}
|
||||||
}).catch(e => logError('constructFriendAddEvent error: ', e));
|
}).catch(e => logError('constructFriendAddEvent error: ', e));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user