GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
linyuchen 2024-03-17 15:46:04 +08:00
parent 8a2245e2ec
commit d93193c7fd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/main.ts
View File

@ -13,7 +13,7 @@ import {
CHANNEL_UPDATE, CHANNEL_UPDATE,
} from "../common/channels"; } from "../common/channels";
import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer"; import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
import {checkFfmpeg, DATA_DIR, getConfigUtil, log} from "../common/utils"; import {checkFfmpeg, checkVersion, DATA_DIR, getConfigUtil, log, updateLLOneBot} from "../common/utils";
import { import {
friendRequests, friendRequests,
getFriend, getFriend,
@ -202,12 +202,12 @@ function onLoad() {
"doubt": boolean, "doubt": boolean,
"oldestUnreadSeq": string, "oldestUnreadSeq": string,
"unreadCount": number "unreadCount": number
}>(ReceiveCmd.UNREAD_GROUP_NOTIFY, async (payload) => { }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
if (payload.unreadCount) { if (payload.unreadCount) {
// log("开始获取群通知详情") // log("开始获取群通知详情")
let notify: GroupNotifies; let notify: GroupNotifies;
try { try {
notify = await NTQQApi.getGroupNotifies(); notify = await NTQQGroupApi.getGroupNotifies();
} catch (e) { } catch (e) {
// log("获取群通知详情失败", e); // log("获取群通知详情失败", e);
return return
@ -260,7 +260,7 @@ function onLoad() {
groupRequestEvent.group_id = parseInt(notify.group.groupCode); groupRequestEvent.group_id = parseInt(notify.group.groupCode);
let requestQQ = "" let requestQQ = ""
try { try {
requestQQ = (await NTQQApi.getUserDetailInfo(notify.user1.uid)).uin; requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin;
} catch (e) { } catch (e) {
log("获取加群人QQ号失败", e) log("获取加群人QQ号失败", e)
} }
@ -275,7 +275,7 @@ function onLoad() {
groupInviteEvent.group_id = parseInt(notify.group.groupCode); groupInviteEvent.group_id = parseInt(notify.group.groupCode);
let user_id = (await getFriend(notify.user2.uid))?.uin let user_id = (await getFriend(notify.user2.uid))?.uin
if (!user_id) { if (!user_id) {
user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
} }
groupInviteEvent.user_id = parseInt(user_id); groupInviteEvent.user_id = parseInt(user_id);
groupInviteEvent.sub_type = "invite"; groupInviteEvent.sub_type = "invite";
@ -292,14 +292,14 @@ function onLoad() {
} }
}) })
registerReceiveHook<FriendRequestNotify>(ReceiveCmd.FRIEND_REQUEST, async (payload) => { registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
for (const req of payload.data.buddyReqs) { for (const req of payload.data.buddyReqs) {
if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) { if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
friendRequests[req.sourceId] = req; friendRequests[req.sourceId] = req;
log("有新的好友请求", req); log("有新的好友请求", req);
let friendRequestEvent = new OB11FriendRequestEvent(); let friendRequestEvent = new OB11FriendRequestEvent();
try { try {
let requester = await NTQQApi.getUserDetailInfo(req.friendUid) let requester = await NTQQUserApi.getUserDetailInfo(req.friendUid)
friendRequestEvent.user_id = parseInt(requester.uin); friendRequestEvent.user_id = parseInt(requester.uin);
} catch (e) { } catch (e) {
log("获取加好友者QQ号失败", e); log("获取加好友者QQ号失败", e);
@ -318,7 +318,7 @@ function onLoad() {
log("llonebot pid", process.pid) log("llonebot pid", process.pid)
startTime = Date.now(); startTime = Date.now();
startReceiveHook().then(); startReceiveHook().then();
NTQQApi.getGroups(true).then() NTQQGroupApi.getGroups(true).then()
const config = getConfigUtil().getConfig() const config = getConfigUtil().getConfig()
// 检查ffmpeg // 检查ffmpeg
checkFfmpeg(config.ffmpeg).then(exist => { checkFfmpeg(config.ffmpeg).then(exist => {
@ -347,7 +347,7 @@ function onLoad() {
const init = async () => { const init = async () => {
try { try {
log("start get self info") log("start get self info")
const _ = await NTQQApi.getSelfInfo(); const _ = await NTQQUserApi.getSelfInfo();
log("get self info api result:", _); log("get self info api result:", _);
Object.assign(selfInfo, _); Object.assign(selfInfo, _);
selfInfo.nick = selfInfo.uin; selfInfo.nick = selfInfo.uin;
@ -357,7 +357,7 @@ function onLoad() {
log("self info", selfInfo); log("self info", selfInfo);
if (selfInfo.uin) { if (selfInfo.uin) {
try { try {
const userInfo = (await NTQQApi.getUserDetailInfo(selfInfo.uid)); const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
log("self info", userInfo); log("self info", userInfo);
if (userInfo) { if (userInfo) {
selfInfo.nick = userInfo.nick; selfInfo.nick = userInfo.nick;