mirror of
https://github.com/LLOneBot/LLOneBot.git
synced 2024-11-22 01:56:33 +00:00
fix: get_group_member_list, send_private_msg, send_group_msg.
feat: auto identify qq to read config
This commit is contained in:
parent
a802e95d89
commit
0c131ff555
13
README.md
13
README.md
@ -1,6 +1,6 @@
|
|||||||
# LLOneBot API
|
# LLOneBot API
|
||||||
|
|
||||||
将NTQQLiteLoaderAPI封装成OneBot11/12标准的API
|
将NTQQLiteLoaderAPI封装成OneBot11/12标准的API, V12没有完整测试
|
||||||
|
|
||||||
## 安装方法
|
## 安装方法
|
||||||
|
|
||||||
@ -38,4 +38,15 @@
|
|||||||
- [ ] 转发消息记录
|
- [ ] 转发消息记录
|
||||||
- [ ] xml
|
- [ ] xml
|
||||||
|
|
||||||
|
支持的api:
|
||||||
|
- [x] get_login_info
|
||||||
|
- [x] send_msg
|
||||||
|
- [x] send_group_msg
|
||||||
|
- [x] send_private_msg
|
||||||
|
- [x] delete_msg
|
||||||
|
- [x] get_group_list
|
||||||
|
- [x] get_group_member_list
|
||||||
|
- [x] get_group_member_info
|
||||||
|
- [x] get_friend_list
|
||||||
|
|
||||||
**自己发送成功的消息也会上报,可以用于获取需要撤回消息的id**
|
**自己发送成功的消息也会上报,可以用于获取需要撤回消息的id**
|
@ -4,7 +4,7 @@
|
|||||||
"name": "LLOneBot",
|
"name": "LLOneBot",
|
||||||
"slug": "LLOneBot",
|
"slug": "LLOneBot",
|
||||||
"description": "LiteLoaderQQNT的OneBotApi",
|
"description": "LiteLoaderQQNT的OneBotApi",
|
||||||
"version": "1.1.0",
|
"version": "1.2.1",
|
||||||
"thumbnail": "./icon.png",
|
"thumbnail": "./icon.png",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "linyuchen",
|
"name": "linyuchen",
|
||||||
|
@ -7,5 +7,5 @@ export const CHANNEL_UPDATE_GROUPS = "llonebot_update_groups"
|
|||||||
export const CHANNEL_UPDATE_FRIENDS = "llonebot_update_friends"
|
export const CHANNEL_UPDATE_FRIENDS = "llonebot_update_friends"
|
||||||
export const CHANNEL_LOG = "llonebot_log"
|
export const CHANNEL_LOG = "llonebot_log"
|
||||||
export const CHANNEL_POST_ONEBOT_DATA = "llonebot_post_onebot_data"
|
export const CHANNEL_POST_ONEBOT_DATA = "llonebot_post_onebot_data"
|
||||||
export const CHANNEL_GET_SELF_INFO= "llonebot_get_self_info"
|
export const CHANNEL_SET_SELF_INFO= "llonebot_set_self_info"
|
||||||
export const CHANNEL_DOWNLOAD_FILE= "llonebot_download_file"
|
export const CHANNEL_DOWNLOAD_FILE= "llonebot_download_file"
|
@ -139,7 +139,7 @@ export type SendMessage = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type PostDataAction = "send_private_msg" | "send_group_msg" | "get_group_list"
|
export type PostDataAction = "send_private_msg" | "send_group_msg" | "get_group_list"
|
||||||
| "get_friend_list" | "delete_msg" | "get_login_info"
|
| "get_friend_list" | "delete_msg" | "get_login_info" | "get_group_member_list" | "get_group_member_info"
|
||||||
|
|
||||||
export type PostDataSendMsg = {
|
export type PostDataSendMsg = {
|
||||||
action: PostDataAction
|
action: PostDataAction
|
||||||
|
@ -5,6 +5,7 @@ import {OnebotGroupMemberRole, PostDataAction, PostDataSendMsg} from "../common/
|
|||||||
import {friends, groups, selfInfo} from "./data";
|
import {friends, groups, selfInfo} from "./data";
|
||||||
|
|
||||||
function handlePost(jsonData: any) {
|
function handlePost(jsonData: any) {
|
||||||
|
jsonData.params = jsonData;
|
||||||
let resData = {
|
let resData = {
|
||||||
status: 0,
|
status: 0,
|
||||||
retcode: 0,
|
retcode: 0,
|
||||||
@ -14,6 +15,12 @@ function handlePost(jsonData: any) {
|
|||||||
if (jsonData.action == "get_login_info") {
|
if (jsonData.action == "get_login_info") {
|
||||||
resData["data"] = selfInfo
|
resData["data"] = selfInfo
|
||||||
} else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
|
} else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
|
||||||
|
if (jsonData.action == "send_private_msg") {
|
||||||
|
jsonData.message_type = "private"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
jsonData.message_type = "group"
|
||||||
|
}
|
||||||
sendIPCSendQQMsg(jsonData);
|
sendIPCSendQQMsg(jsonData);
|
||||||
} else if (jsonData.action == "get_group_list") {
|
} else if (jsonData.action == "get_group_list") {
|
||||||
resData["data"] = groups.map(group => {
|
resData["data"] = groups.map(group => {
|
||||||
@ -97,8 +104,8 @@ export function startExpress(port: number) {
|
|||||||
res.send(resData)
|
res.send(resData)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
const actionList = ["get_login_info", "send_private_msg", "send_group_msg",
|
const actionList: PostDataAction[] = ["get_login_info", "send_private_msg", "send_group_msg",
|
||||||
"get_group_list", "get_friend_list", "delete_msg"]
|
"get_group_list", "get_friend_list", "delete_msg", "get_group_member_list", "get_group_member_info"]
|
||||||
|
|
||||||
for (const action of actionList) {
|
for (const action of actionList) {
|
||||||
parseToOnebot12(action as PostDataAction)
|
parseToOnebot12(action as PostDataAction)
|
||||||
|
@ -21,4 +21,8 @@ export class ConfigUtil{
|
|||||||
return jsonData;
|
return jsonData;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setConfig(config: Config){
|
||||||
|
fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,18 @@
|
|||||||
// 运行在 Electron 主进程 下的插件入口
|
// 运行在 Electron 主进程 下的插件入口
|
||||||
|
|
||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
|
|
||||||
const fs = require('fs');
|
|
||||||
import {ipcMain} from 'electron';
|
import {ipcMain} from 'electron';
|
||||||
|
|
||||||
import {Config, Group, SelfInfo, User} from "../common/types";
|
import {Config, Group, SelfInfo, User} from "../common/types";
|
||||||
import {
|
import {
|
||||||
CHANNEL_DOWNLOAD_FILE,
|
CHANNEL_DOWNLOAD_FILE,
|
||||||
CHANNEL_GET_CONFIG, CHANNEL_GET_SELF_INFO, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
|
CHANNEL_GET_CONFIG,
|
||||||
|
CHANNEL_SET_SELF_INFO,
|
||||||
|
CHANNEL_LOG,
|
||||||
|
CHANNEL_POST_ONEBOT_DATA,
|
||||||
CHANNEL_SET_CONFIG,
|
CHANNEL_SET_CONFIG,
|
||||||
CHANNEL_START_HTTP_SERVER, CHANNEL_UPDATE_FRIENDS,
|
CHANNEL_START_HTTP_SERVER,
|
||||||
|
CHANNEL_UPDATE_FRIENDS,
|
||||||
CHANNEL_UPDATE_GROUPS
|
CHANNEL_UPDATE_GROUPS
|
||||||
} from "../common/IPCChannel";
|
} from "../common/IPCChannel";
|
||||||
import {ConfigUtil} from "./config";
|
import {ConfigUtil} from "./config";
|
||||||
@ -18,19 +20,22 @@ import {startExpress} from "./HttpServer";
|
|||||||
import {log} from "./utils";
|
import {log} from "./utils";
|
||||||
import {friends, groups, selfInfo} from "./data";
|
import {friends, groups, selfInfo} from "./data";
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
|
||||||
|
|
||||||
// 加载插件时触发
|
// 加载插件时触发
|
||||||
function onLoad(plugin: any) {
|
function onLoad(plugin: any) {
|
||||||
|
|
||||||
const configFilePath = path.join(plugin.path.data, "config.json")
|
function getConfigUtil() {
|
||||||
let configUtil = new ConfigUtil(configFilePath)
|
const configFilePath = path.join(plugin.path.data, `config_${selfInfo.user_id}.json`)
|
||||||
|
return new ConfigUtil(configFilePath)
|
||||||
|
}
|
||||||
|
|
||||||
if (!fs.existsSync(plugin.path.data)) {
|
if (!fs.existsSync(plugin.path.data)) {
|
||||||
fs.mkdirSync(plugin.path.data, {recursive: true});
|
fs.mkdirSync(plugin.path.data, {recursive: true});
|
||||||
}
|
}
|
||||||
ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
|
ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
|
||||||
return configUtil.getConfig()
|
return getConfigUtil().getConfig()
|
||||||
})
|
})
|
||||||
ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: {uri: string, localFilePath: string}) => {
|
ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: {uri: string, localFilePath: string}) => {
|
||||||
let url = new URL(arg.uri);
|
let url = new URL(arg.uri);
|
||||||
@ -51,11 +56,11 @@ function onLoad(plugin: any) {
|
|||||||
return arg.localFilePath;
|
return arg.localFilePath;
|
||||||
})
|
})
|
||||||
ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
|
ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
|
||||||
fs.writeFileSync(configFilePath, JSON.stringify(arg, null, 2), "utf-8")
|
getConfigUtil().setConfig(arg)
|
||||||
})
|
})
|
||||||
|
|
||||||
ipcMain.on(CHANNEL_START_HTTP_SERVER, (event: any, arg: any) => {
|
ipcMain.on(CHANNEL_START_HTTP_SERVER, (event: any, arg: any) => {
|
||||||
startExpress(configUtil.getConfig().port)
|
startExpress(getConfigUtil().getConfig().port)
|
||||||
})
|
})
|
||||||
|
|
||||||
ipcMain.on(CHANNEL_UPDATE_GROUPS, (event: any, arg: Group[]) => {
|
ipcMain.on(CHANNEL_UPDATE_GROUPS, (event: any, arg: Group[]) => {
|
||||||
@ -89,7 +94,7 @@ function onLoad(plugin: any) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
ipcMain.on(CHANNEL_POST_ONEBOT_DATA, (event: any, arg: any) => {
|
ipcMain.on(CHANNEL_POST_ONEBOT_DATA, (event: any, arg: any) => {
|
||||||
for(const host of configUtil.getConfig().hosts) {
|
for(const host of getConfigUtil().getConfig().hosts) {
|
||||||
try {
|
try {
|
||||||
fetch(host, {
|
fetch(host, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@ -113,7 +118,7 @@ function onLoad(plugin: any) {
|
|||||||
log(arg)
|
log(arg)
|
||||||
})
|
})
|
||||||
|
|
||||||
ipcMain.on(CHANNEL_GET_SELF_INFO, (event: any, arg: SelfInfo) => {
|
ipcMain.handle(CHANNEL_SET_SELF_INFO, (event: any, arg: SelfInfo) => {
|
||||||
selfInfo.user_id = arg.user_id;
|
selfInfo.user_id = arg.user_id;
|
||||||
selfInfo.nickname = arg.nickname;
|
selfInfo.nickname = arg.nickname;
|
||||||
})
|
})
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
|
import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
|
||||||
import {
|
import {
|
||||||
CHANNEL_DOWNLOAD_FILE,
|
CHANNEL_DOWNLOAD_FILE,
|
||||||
CHANNEL_GET_CONFIG, CHANNEL_GET_SELF_INFO, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
|
CHANNEL_GET_CONFIG, CHANNEL_SET_SELF_INFO, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
|
||||||
CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG,
|
CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG,
|
||||||
CHANNEL_SET_CONFIG,
|
CHANNEL_SET_CONFIG,
|
||||||
CHANNEL_START_HTTP_SERVER, CHANNEL_UPDATE_FRIENDS, CHANNEL_UPDATE_GROUPS
|
CHANNEL_START_HTTP_SERVER, CHANNEL_UPDATE_FRIENDS, CHANNEL_UPDATE_GROUPS
|
||||||
@ -48,7 +48,7 @@ contextBridge.exposeInMainWorld("llonebot", {
|
|||||||
return ipcRenderer.invoke(CHANNEL_GET_CONFIG);
|
return ipcRenderer.invoke(CHANNEL_GET_CONFIG);
|
||||||
},
|
},
|
||||||
setSelfInfo(selfInfo: SelfInfo){
|
setSelfInfo(selfInfo: SelfInfo){
|
||||||
ipcRenderer.send(CHANNEL_GET_SELF_INFO, selfInfo)
|
ipcRenderer.invoke(CHANNEL_SET_SELF_INFO, selfInfo)
|
||||||
},
|
},
|
||||||
downloadFile: async (arg: {uri: string, localFilePath: string}) => {
|
downloadFile: async (arg: {uri: string, localFilePath: string}) => {
|
||||||
return ipcRenderer.invoke(CHANNEL_DOWNLOAD_FILE, arg);
|
return ipcRenderer.invoke(CHANNEL_DOWNLOAD_FILE, arg);
|
||||||
|
@ -247,7 +247,7 @@ function recallMessage(msgId: string) {
|
|||||||
let chatListEle: HTMLCollectionOf<Element>
|
let chatListEle: HTMLCollectionOf<Element>
|
||||||
|
|
||||||
function onLoad() {
|
function onLoad() {
|
||||||
window.llonebot.startExpress();
|
|
||||||
window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
|
window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
|
||||||
listenSendMessage(postData).then()
|
listenSendMessage(postData).then()
|
||||||
});
|
});
|
||||||
@ -300,7 +300,8 @@ function onLoad() {
|
|||||||
window.llonebot.setSelfInfo({
|
window.llonebot.setSelfInfo({
|
||||||
user_id: accountInfo.uin,
|
user_id: accountInfo.uin,
|
||||||
nickname: userInfo.nickName
|
nickname: userInfo.nickName
|
||||||
})
|
});
|
||||||
|
window.llonebot.startExpress();
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user