From abaf9a92f59a9527f5b8f0d3c9d21d47d163fa96 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 28 Apr 2024 16:40:06 +0800
Subject: [PATCH] 1

---
 server/imserver/common/types.go   |  2 ++
 server/imserver/dblog/dblogmgr.go | 21 ++++++++++++++++++++-
 server/imserver/player/player.go  |  4 ++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/server/imserver/common/types.go b/server/imserver/common/types.go
index fa00609b..9e960e6b 100644
--- a/server/imserver/common/types.go
+++ b/server/imserver/common/types.go
@@ -128,9 +128,11 @@ type CacheMgr interface {
 }
 
 type DbLogMgr interface {
+	FriendApply(string, string)
 	FriendAdd(string, string)
 	FriendDel(string, string)
 
+	GuildApply(string, string)
 	GuildClearEmptyStart(string, string)
 	GuildClearEmptyEnd(string, string)
 	GuildCreateConsumeBegin(string, string, string)
diff --git a/server/imserver/dblog/dblogmgr.go b/server/imserver/dblog/dblogmgr.go
index 825a8a57..e37affab 100644
--- a/server/imserver/dblog/dblogmgr.go
+++ b/server/imserver/dblog/dblogmgr.go
@@ -11,16 +11,19 @@ type dbLogMgr struct {
 }
 
 const (
+	LOG_TYPE_FRIEND_APPLY = "friend.apply"
 	LOG_TYPE_FRIEND_ADD = "friend.add"
 	LOG_TYPE_FRIEND_DEL = "friend.del"
 
+	LOG_TYPE_GUILD_APPLY = "guild.apply"
+
 	LOG_TYPE_GUILD_CLEAR_EMPTY_START = "guild.clear_empty.start"
 	LOG_TYPE_GUILD_CLEAR_EMPTY_END = "guild.clear_empty.end"
 
 	LOG_TYPE_GUILD_CREATE_CONSUME_BEGIN = "guild.create_consume.begin"
 	LOG_TYPE_GUILD_CREATE_CONSUME_END = "guild.create_consume.end"
 
-	LOG_TYPE_GUILD_ACCEPT_APPLY = "guild.apply.accept"
+	LOG_TYPE_GUILD_ACCEPT_APPLY = "guild.accept"
 
 	LOG_TYPE_GUILD_LEAVE = "guild.leave"
 	LOG_TYPE_GUILD_KICKOUT = "guild.kickout"
@@ -53,6 +56,14 @@ func (this *dbLogMgr) addLog(fields [][]string) {
 		})
 }
 
+func (this *dbLogMgr) FriendApply(senderId string, targetId string) {
+	this.addLog([][]string{
+		{"log_type", LOG_TYPE_FRIEND_APPLY},
+		{"param1", senderId},
+		{"param2", targetId},
+	})
+}
+
 func (this *dbLogMgr) FriendAdd(senderId string, targetId string) {
 	this.addLog([][]string{
 		{"log_type", LOG_TYPE_FRIEND_ADD},
@@ -69,6 +80,14 @@ func (this *dbLogMgr) FriendDel(senderId string, targetId string) {
 	})
 }
 
+func (this *dbLogMgr) GuildApply(senderId string, guildId string) {
+	this.addLog([][]string{
+		{"log_type", LOG_TYPE_GUILD_APPLY},
+		{"param1", senderId},
+		{"param2", guildId},
+	})
+}
+
 func (this *dbLogMgr) GuildClearEmptyStart(guildId string, guildName string) {
 	this.addLog([][]string{
 		{"log_type", LOG_TYPE_GUILD_CLEAR_EMPTY_START},
diff --git a/server/imserver/player/player.go b/server/imserver/player/player.go
index 0706876f..a078dd0c 100644
--- a/server/imserver/player/player.go
+++ b/server/imserver/player/player.go
@@ -163,6 +163,9 @@ func (this *player) CMAddFriendRequest(hdr *f5.MsgHdr, msg *cs.CMAddFriendReques
 		this.GetAccountId(),
 		msg.GetTargetAccountId(),
 		func (errCode int32, errMsg string) {
+			if errCode == 0 {
+				GetDbLogMgr().FriendApply(this.GetAccountId(), msg.GetTargetAccountId())
+			}
 			this.SendMsg(rspMsg.Err(errCode, errMsg))
 			return
 		})
@@ -518,6 +521,7 @@ func (this *player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) {
 				this.SendMsg(rspMsg.Err(errCode, errMsg))
 				return
 			}
+			GetDbLogMgr().GuildApply(this.GetAccountId(), q5.ToString(msg.GetGuildId()))
 			this.SendMsg(rspMsg)
 			if okGuild != nil {
 				pbGuilds := []*cs.MFGuildMember{}