diff --git a/server/imserver/groupmgr.cc b/server/imserver/groupmgr.cc index 8495e6e..96101e7 100644 --- a/server/imserver/groupmgr.cc +++ b/server/imserver/groupmgr.cc @@ -83,6 +83,7 @@ void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_Forward void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGroupCreate& msg) { + #if 0 Group* group = GetGroup(context.group_id()); if (group) { cs::SMGroupCreate respmsg; @@ -91,10 +92,12 @@ void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGrou ForwardGroupSMMsg(context, respmsg); return; } + #endif } void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJoin& msg) { + #if 0 Group* group = GetGroup(msg.group_id()); if (!group) { cs::SMGroupJoin respmsg; @@ -125,18 +128,22 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ member->group_id = group->group_id; member->data_version1 = context.base_data_version(); group->AddMember(member); + #endif } void GroupMgr::_CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroupAgree& msg) { +#if 0 Group* group = GetGroup(context.group_id()); if (!group) { return; } +#endif } void GroupMgr::_CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupKick& msg) { + #if 0 Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupKick respmsg; @@ -154,10 +161,12 @@ void GroupMgr::_CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupK cs::SMGroupKick respmsg; ForwardGroupSMMsg(context, respmsg); return; + #endif } void GroupMgr::_CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQuit& msg) { +#if 0 Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupQuit respmsg; @@ -174,18 +183,22 @@ void GroupMgr::_CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQ group->RemoveMember(context.account_id()); cs::SMGroupQuit respmsg; ForwardGroupSMMsg(context, respmsg); +#endif } void GroupMgr::_CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGroupDismiss& msg) { + #if 0 Group* group = GetGroup(context.group_id()); if (!group) { return; } + #endif } void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGroupRename& msg) { + #if 0 Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupRename respmsg; @@ -205,6 +218,7 @@ void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGrou group->RemoveMember(msg.new_group_name()); cs::SMGroupRename respmsg; ForwardGroupSMMsg(context, respmsg); + #endif } Group* GroupMgr::GetGroup(long long group_id) diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index 0d1623c..1ada794 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -35,7 +35,7 @@ void PlayerMgr::_SS_IM_SendChatMsg(f8::MsgHdr& hdr, const ss::SS_IM_SendChatMsg& Player* hum = GetPlayerByAccountId(msg.target()); if (hum) { cs::SMChatMsgNotify notifymsg; - notifymsg.set_sender(msg.context().account_id()); + notifymsg.set_sender(msg.context().user_info().base_data().account_id()); notifymsg.set_chat_channel(msg.chat_channel()); notifymsg.set_msg(msg.msg()); hum->SendMsg(notifymsg); @@ -47,7 +47,7 @@ void PlayerMgr::_SS_IM_SendCustomMsg(f8::MsgHdr& hdr, const ss::SS_IM_SendCustom Player* hum = GetPlayerByAccountId(msg.target()); if (hum) { cs::SMCustomMsgNotify notifymsg; - notifymsg.set_sender(msg.context().account_id()); + notifymsg.set_sender(msg.context().user_info().base_data().account_id()); notifymsg.set_msg(msg.msg()); notifymsg.set_param1(msg.param1()); notifymsg.set_param2(msg.param2()); diff --git a/server/imserver/synchelper.cc b/server/imserver/synchelper.cc index df5717c..b0992af 100644 --- a/server/imserver/synchelper.cc +++ b/server/imserver/synchelper.cc @@ -4,6 +4,7 @@ #include "synchelper.h" #include "player.h" +#include "playermgr.h" #include "app.h" void SyncHelper::Init() @@ -16,7 +17,10 @@ void SyncHelper::UnInit() void SyncHelper::SyncNewFriend(Player* hum, const std::string& target_id) { + Player* target = PlayerMgr::Instance()->GetPlayerByAccountId(target_id); + if (target) { + } } void SyncHelper::SyncDeleteFriend(Player* hum, const std::string& target_id) diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index a9d8a4e..eae990c 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -4,17 +4,7 @@ import "cs_proto.proto"; message MFIMMsgConext { - optional string account_id = 1; //账号id - optional string nickname = 2; //昵称 - optional string avatar_url = 3; //头像 - optional int32 sex = 4; //性别 1:男 2:女 0:未知 - optional int32 last_login_time = 5; //最后登录时间 - optional int32 group_id = 6; //群id - - optional int64 user_value1 = 50; //用户字段1 - optional int64 user_value2 = 51; //用户字段2 - optional int64 user_value3 = 52; //用户字段3 - optional int64 base_data_version = 100; //数据版本号 + optional cs.MFUserInfo user_info = 1; } message MFIMServerInfo @@ -205,3 +195,15 @@ message SS_IM_UpdateUserInfo { optional cs.MFUserInfo user_info = 1; } + +message SS_IM_FriendAgreeRequest +{ + optional MFIMMsgConext context = 1; + optional string target_id = 3; +} + +message SS_IM_FriendAgreeResponse +{ + optional MFIMMsgConext context = 1; + optional string target_id = 3; +}