From e2945e13a6b29b01b7e6e4bbeada575e1a5e6186 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 30 Mar 2024 12:55:36 +0800
Subject: [PATCH] 1

---
 server/imserver_new/common/types.go   | 3 ++-
 server/imserver_new/guild/guild.go    | 4 ++++
 server/imserver_new/guild/guildmgr.go | 1 +
 server/imserver_new/player/player.go  | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index bec403b9..c648e74e 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -58,7 +58,7 @@ type FriendMgr interface {
 	IsFriend(string, string) bool
 	GetFriendList(string) []string
 	GetBlackList(string) []string
-	AsyncGetApplyList(int64, string, func(int32, string, int64, []string))
+	AsyncGetApplyList(string, string, func(int32, string, int64, []string))
 	AsyncAddFriend(string, string, func(int32, string))
 	AsyncAccpetApply(string, string, func(int32, string))
 	AsyncRejectApply(string, string, func(int32, string))
@@ -69,6 +69,7 @@ type FriendMgr interface {
 
 type Guild interface {
 	GetGuildId() string
+	GetGuildName() string
 }
 
 type GuildMember interface {
diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index eae00a2d..72021f81 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -21,3 +21,7 @@ type guild struct {
 func (this *guild) GetGuildId() string {
 	return this.guildId
 }
+
+func (this *guild) GetGuildName() string {
+	return this.guildName
+}
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index c4169c8b..aa531583 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -50,6 +50,7 @@ func (this *guildMgr) GetGuildRank() []common.Guild {
 func (this *guildMgr) AsyncCreateGuild(string, string, func(int32, string, int64)) {
 
 }
+
 func (this *guildMgr) AsyncGetApplyList(int64, string, func(int32, string, int64, []string)) {
 
 }
diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go
index 1c4fa8f2..89ee181b 100644
--- a/server/imserver_new/player/player.go
+++ b/server/imserver_new/player/player.go
@@ -92,7 +92,7 @@ func (this *player) CMSearchUserByAccountId(hdr *f5.MsgHdr, msg *cs.CMSearchUser
 
 func (this *player) CMListPendingFriendRequest(hdr *f5.MsgHdr, msg *cs.CMListPendingFriendRequest) {
 	GetFriendMgr().AsyncGetApplyList(
-		0,
+		"",
 		this.GetAccountId(),
 		func (errCode int32, errMsg string, sinceId int64, accountIds []string) {
 			rspMsg := new(cs.SMListPendingFriendRequest)