feat(chatroom): impl delete chatroom members

This commit is contained in:
Changhua 2025-03-05 22:01:57 +08:00
parent da3357cb3b
commit 51312d1bbe
2 changed files with 22 additions and 19 deletions

View File

@ -2,6 +2,7 @@
#include "chatroom_manager.h" #include "chatroom_manager.h"
#include "log.hpp" #include "log.hpp"
#include "offsets.h"
#include "pb_util.h" #include "pb_util.h"
#include "rpc_helper.h" #include "rpc_helper.h"
#include "util.h" #include "util.h"
@ -11,14 +12,15 @@ extern QWORD g_WeChatWinDllAddr;
namespace chatroom namespace chatroom
{ {
namespace OsRoom = Offsets::Chatroom;
#define OS_GET_CHATROOM_MGR 0x1B83BD0 #define OS_GET_CHATROOM_MGR 0x1B83BD0
#define OS_ADD_MEMBERS 0x2155100 #define OS_ADD_MEMBERS 0x2155100
#define OS_DELETE_MEMBERS 0x2155740
#define OS_INVITE_MEMBERS 0x2154AE0 #define OS_INVITE_MEMBERS 0x2154AE0
using get_chatroom_mgr_t = QWORD (*)(); using get_chatroom_mgr_t = QWORD (*)();
using add_member_to_chatroom_t = QWORD (*)(QWORD, QWORD, QWORD, QWORD); using add_member_to_chatroom_t = QWORD (*)(QWORD, QWORD, QWORD, QWORD);
using del_member_from_chatroom_t = QWORD (*)(QWORD, QWORD, QWORD); using del_member_from_chatroom_t = QWORD (*)(QWORD, QWORD, WxString *);
using invite_member_to_chatroom_t = QWORD (*)(QWORD, QWORD, QWORD, QWORD); using invite_member_to_chatroom_t = QWORD (*)(QWORD, QWORD, QWORD, QWORD);
static vector<WxString> parse_wxids(const string &wxids) static vector<WxString> parse_wxids(const string &wxids)
@ -53,21 +55,15 @@ int add_chatroom_member(const string &roomid, const string &wxids)
int del_chatroom_member(const string &roomid, const string &wxids) int del_chatroom_member(const string &roomid, const string &wxids)
{ {
if (roomid.empty() || wxids.empty()) { get_chatroom_mgr_t get_chatroom_mgr = reinterpret_cast<get_chatroom_mgr_t>(g_WeChatWinDllAddr + OsRoom::MGR);
LOG_ERROR("Empty roomid or wxids.");
return -1;
}
get_chatroom_mgr_t get_chatroom_mgr
= reinterpret_cast<get_chatroom_mgr_t>(g_WeChatWinDllAddr + OS_GET_CHATROOM_MGR);
del_member_from_chatroom_t del_members del_member_from_chatroom_t del_members
= reinterpret_cast<del_member_from_chatroom_t>(g_WeChatWinDllAddr + OS_DELETE_MEMBERS); = reinterpret_cast<del_member_from_chatroom_t>(g_WeChatWinDllAddr + OsRoom::DEL);
vector<WxString> wx_members = parse_wxids(wxids); WxString *wx_roomid = util::CreateWxString(roomid);
auto wx_roomid = util::new_wx_string(roomid); auto wx_members = util::parse_wxids(wxids).wxWxids;
QWORD p_members = reinterpret_cast<QWORD>(&wx_members.front()); QWORD p_members = reinterpret_cast<QWORD>(&wx_members);
return static_cast<int>(del_members(get_chatroom_mgr(), p_members, reinterpret_cast<QWORD>(wx_roomid.get()))); return static_cast<int>(del_members(get_chatroom_mgr(), p_members, wx_roomid));
} }
int invite_chatroom_member(const string &roomid, const string &wxids) int invite_chatroom_member(const string &roomid, const string &wxids)
@ -98,10 +94,17 @@ bool rpc_add_chatroom_member(const MemberMgmt &m, uint8_t *out, size_t *len)
bool rpc_delete_chatroom_member(const MemberMgmt &m, uint8_t *out, size_t *len) bool rpc_delete_chatroom_member(const MemberMgmt &m, uint8_t *out, size_t *len)
{ {
const std::string wxids = m.wxids; int status = -1;
const std::string roomid = m.roomid; if (m.wxids && m.roomid) {
return fill_response<Functions_FUNC_DEL_ROOM_MEMBERS>( const std::string wxids = m.wxids;
out, len, [&](Response &rsp) { rsp.msg.status = del_chatroom_member(roomid, wxids); }); const std::string roomid = m.roomid;
status = del_chatroom_member(roomid, wxids);
} else {
LOG_ERROR("wxid 和 roomid 不能为空");
}
return fill_response<Functions_FUNC_DEL_ROOM_MEMBERS>(out, len, [&](Response &rsp) { rsp.msg.status = status; });
} }
bool rpc_invite_chatroom_member(const MemberMgmt &m, uint8_t *out, size_t *len) bool rpc_invite_chatroom_member(const MemberMgmt &m, uint8_t *out, size_t *len)

View File

@ -267,7 +267,7 @@ const std::unordered_map<Functions, RpcServer::FunctionHandler> RpcServer::rpcFu
{ Functions_FUNC_DECRYPT_IMAGE, [](const Request &r, uint8_t *out, size_t *len) { return misc::rpc_decrypt_image(r.msg.dec, out, len); } }, { Functions_FUNC_DECRYPT_IMAGE, [](const Request &r, uint8_t *out, size_t *len) { return misc::rpc_decrypt_image(r.msg.dec, out, len); } },
{ Functions_FUNC_EXEC_OCR, [](const Request &r, uint8_t *out, size_t *len) { return misc::rpc_get_ocr_result(r.msg.str, out, len); } }, { Functions_FUNC_EXEC_OCR, [](const Request &r, uint8_t *out, size_t *len) { return misc::rpc_get_ocr_result(r.msg.str, out, len); } },
// { Functions_FUNC_ADD_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_add_chatroom_member(r.msg.m, out, len); } }, // { Functions_FUNC_ADD_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_add_chatroom_member(r.msg.m, out, len); } },
// { Functions_FUNC_DEL_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_delete_chatroom_member(r.msg.m, out, len); } }, { Functions_FUNC_DEL_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_delete_chatroom_member(r.msg.m, out, len); } },
// { Functions_FUNC_INV_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_invite_chatroom_member(r.msg.m, out, len); } }, // { Functions_FUNC_INV_ROOM_MEMBERS, [](const Request &r, uint8_t *out, size_t *len) { return chatroom::rpc_invite_chatroom_member(r.msg.m, out, len); } },
// clang-format on // clang-format on
}; };