From a6724dc9331c0a27bd65b4eae97c8f5586784326 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 7 Apr 2024 21:27:53 +0800
Subject: [PATCH] 1

---
 server/imserver_new/common/types.go  |  2 +-
 server/imserver_new/guild/guild.go   |  2 +-
 server/imserver_new/player/player.go | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index aa204711..eda7d1aa 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -70,7 +70,7 @@ type FriendMgr interface {
 type Guild interface {
 	GetGuildId() string
 	GetGuildName() string
-	FillMFGuild(*cs.MFGuild)
+	AsyncFillMFGuild(*cs.MFGuild, func(int32, string))
 }
 
 type GuildMember interface {
diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index 36bb213c..568f40f9 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -62,7 +62,7 @@ func (this *guild) isOwner(accountId string) bool {
 	return this.ownerId == accountId
 }
 
-func (this *guild) FillMFGuild(pbGuild *cs.MFGuild) {
+func (this *guild) AsyncFillMFGuild(pbGuild *cs.MFGuild, cb func(int32, string)) {
 	pbGuild.AutoId = proto.Int64(0)
 	pbGuild.GuildId = proto.Int64(q5.ToInt64(this.guildId))
 	pbGuild.Name = proto.String(this.guildName)
diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go
index cf3eb205..f1398c9a 100644
--- a/server/imserver_new/player/player.go
+++ b/server/imserver_new/player/player.go
@@ -358,6 +358,16 @@ func (this *player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
 		this.SendMsg(rspMsg.Err(1, "guild not exists"))
 		return
 	}
+	rspMsg.Guild = new(cs.MFGuild)
+	guild.AsyncFillMFGuild(rspMsg.Guild,
+		func (errCode int32, errMsg string) {
+			if errCode != 0 {
+				this.SendMsg(rspMsg.Err(500, "server internal error"))
+				return
+
+			}
+			this.SendMsg(rspMsg)
+		})
 }
 
 func (this *player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) {