server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-27 18:47:32 +08:00
parent 8d04dbde9e
commit 15008a373a
6 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/imserver/handlermgr.cc
View File

@ -42,6 +42,8 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&immsghandler, &SyncHelper::_SS_IM_FriendAgreeResponse);
RegisterNetMsgHandler(&immsghandler, &SyncHelper::_SS_IM_FriendDeleteResponse);
RegisterNetMsgHandler(&immsghandler, &SyncHelper::_SS_IM_GuildMemberQuitResponse);
RegisterNetMsgHandler(&immsghandler, &SyncHelper::_SS_IM_GuildMemberUpdateResponse);
RegisterNetMsgHandler(&immsghandler, &PlayerMgr::_SS_IM_PushUserOnlineState);
RegisterNetMsgHandler(&immsghandler, &PlayerMgr::_SS_IM_RandomUsersResponse);
@ -62,6 +64,8 @@ void HandlerMgr::RegisterNetMsgHandlers()
RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_OnUserOffline);
RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_QueryUserOnlineState);
RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_RandomUsersRequest);
RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_GuildMemberQuitRequest);
RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_GuildMemberUpdateRequest);
RegisterNetMsgHandler(&wsmsghandler, &WSListener::_SS_Ping);

10
server/imserver/playermgr.cc
View File

@ -202,6 +202,16 @@ void PlayerMgr::_SS_IM_RandomUsersResponse(f8::MsgHdr& hdr, const ss::SS_IM_Rand
AsyncTaskMgr::Instance()->_SS_IM_RandomUsersResponse(hdr, msg);
}
void PlayerMgr::_SS_IM_GuildMemberQuitRequest(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberQuitRequest& msg)
{
}
void PlayerMgr::_SS_IM_GuildMemberUpdateRequest(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberUpdateRequest& msg)
{
}
void PlayerMgr::_SS_IM_UpdateUserInfo(f8::MsgHdr& hdr, const ss::SS_IM_UpdateUserInfo& msg)
{
auto itr = watch_players_.find(msg.user_info().base_data().account_id());

6
server/imserver/playermgr.h
View File

@ -22,6 +22,10 @@ namespace ss
class SS_IM_PushUserOnlineState;
class SS_IM_RandomUsersRequest;
class SS_IM_RandomUsersResponse;
class SS_IM_GuildMemberQuitRequest;
class SS_IM_GuildMemberQuitResponse;
class SS_IM_GuildMemberUpdateRequest;
class SS_IM_GuildMemberUpdateResponse;
}
class Player;
@ -51,6 +55,8 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
void _SS_IM_PushUserOnlineState(f8::MsgHdr& hdr, const ss::SS_IM_PushUserOnlineState& msg);
void _SS_IM_RandomUsersRequest(f8::MsgHdr& hdr, const ss::SS_IM_RandomUsersRequest& msg);
void _SS_IM_RandomUsersResponse(f8::MsgHdr& hdr, const ss::SS_IM_RandomUsersResponse& msg);
void _SS_IM_GuildMemberQuitRequest(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberQuitRequest& msg);
void _SS_IM_GuildMemberUpdateRequest(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberUpdateRequest& msg);
void _SS_IM_UpdateUserInfo(f8::MsgHdr& hdr, const ss::SS_IM_UpdateUserInfo& msg);

18
server/imserver/synchelper.cc
View File

@ -188,6 +188,24 @@ void SyncHelper::_SS_IM_FriendDeleteResponse(f8::MsgHdr& hdr, const ss::SS_IM_Fr
}
}
void SyncHelper::_SS_IM_GuildMemberQuitResponse(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberQuitResponse& msg)
{
auto itr = pending_request_hash_.find(msg.seqid());
if (itr != pending_request_hash_.end()) {
a8::Timer::Instance()->DeleteTimer(itr->second);
RemovePendingRequest(msg.seqid());
}
}
void SyncHelper::_SS_IM_GuildMemberUpdateResponse(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberUpdateResponse& msg)
{
auto itr = pending_request_hash_.find(msg.seqid());
if (itr != pending_request_hash_.end()) {
a8::Timer::Instance()->DeleteTimer(itr->second);
RemovePendingRequest(msg.seqid());
}
}
void SyncHelper::RemovePendingRequest(long long seqid)
{
pending_request_hash_.erase(seqid);

4
server/imserver/synchelper.h
View File

@ -9,7 +9,9 @@ namespace ss
class SS_IM_FriendDeleteRequest;
class SS_IM_FriendDeleteResponse;
class SS_IM_GuildMemberQuitRequest;
class SS_IM_GuildMemberQuitResponse;
class SS_IM_GuildMemberUpdateRequest;
class SS_IM_GuildMemberUpdateResponse;
}
class Guild;
@ -45,6 +47,8 @@ public:
void _SS_IM_FriendAgreeResponse(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeResponse& msg);
void _SS_IM_FriendDeleteResponse(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteResponse& msg);
void _SS_IM_GuildMemberQuitResponse(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberQuitResponse& msg);
void _SS_IM_GuildMemberUpdateResponse(f8::MsgHdr& hdr, const ss::SS_IM_GuildMemberUpdateResponse& msg);
private:

7
server/tools/protobuild/ss_proto.proto
View File

@ -337,10 +337,6 @@ message SS_IM_GuildMemberQuitRequest
message SS_IM_GuildMemberQuitResponse
{
optional int64 seqid = 1;
optional int64 guild_id = 2;
optional string sender_id = 3;
optional string target_id = 4;
optional int32 reason = 5;
}
message SS_IM_GuildMemberUpdateRequest
@ -355,7 +351,4 @@ message SS_IM_GuildMemberUpdateRequest
message SS_IM_GuildMemberUpdateResponse
{
optional int64 seqid = 1;
optional int64 guild_id = 2;
optional string target_id = 4;
optional int32 reason = 5;
}