Compare commits

..

4 Commits

Author SHA1 Message Date
linyuchen
06ad92b846 ver: 3.2.2 2024-02-17 01:44:21 +08:00
linyuchen
df5968ccc1 Merge pull request #47 from YuChuXi/patch-1
fix get_group_info
2024-02-17 01:43:12 +08:00
YuChuXi
e554d805b5 修东西
fix: get_group_info和get_group_list都返回群列表
2024-02-17 01:39:06 +08:00
linyuchen
d54111ce94 fix: ws url token parse 2024-02-16 22:48:43 +08:00
5 changed files with 9 additions and 9 deletions

View File

@@ -4,7 +4,7 @@
"name": "LLOneBot",
"slug": "LLOneBot",
"description": "LiteLoaderQQNT的OneBotApi",
"version": "3.2.0",
"version": "3.2.2",
"thumbnail": "./icon.png",
"authors": [{
"name": "linyuchen",

View File

@@ -88,5 +88,5 @@ export function getStrangerByUin(uin: string) {
}
}
export const version = "v3.2.0"
export const version = "v3.2.2"
export const heartInterval = 15000 // 毫秒

View File

@@ -33,7 +33,7 @@ export function log(...msg: any[]) {
}
logMsg += msgItem + " ";
}
logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n`
logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
// sendLog(...msg);
// console.log(msg)
fs.appendFile(path.join(CONFIG_DIR , `llonebot-${currentDate}.log`), logMsg, (err: any) => {

View File

@@ -1,5 +1,5 @@
import { OB11Group } from '../types';
import { getGroup, groups } from "../../common/data";
import { getGroup } from "../../common/data";
import { OB11Constructor } from "../constructor";
import BaseAction from "./BaseAction";
import { ActionName } from "./types";
@@ -8,17 +8,17 @@ interface PayloadType {
group_id: number
}
class GetGroupInfo extends BaseAction<PayloadType, OB11Group[]> {
class GetGroupInfo extends BaseAction<PayloadType, OB11Group> {
actionName = ActionName.GetGroupInfo
protected async _handle(payload: PayloadType) {
const group = await getGroup(payload.group_id.toString())
if (group) {
return OB11Constructor.groups(groups)
return OB11Constructor.group(group)
} else {
throw `${payload.group_id}不存在`
}
}
}
export default GetGroupInfo
export default GetGroupInfo

View File

@@ -103,7 +103,7 @@ export function startWSServer(port: number) {
}
wsServer = new websocket.Server({port})
wsServer.on("connection", (ws, req) => {
const url = req.url;
const url = req.url.split("?").shift();
log("received ws connect", url)
let token: string = ""
const authHeader = req.headers['authorization'];
@@ -111,7 +111,7 @@ export function startWSServer(port: number) {
token = authHeader.split("Bearer ").pop()
log("receive ws header token", token);
} else {
const parsedUrl = urlParse.parse(url, true);
const parsedUrl = urlParse.parse(req.url, true);
const urlToken = parsedUrl.query.access_token;
if (urlToken) {
if (Array.isArray(urlToken)) {