From 360f7a0666c31a0aa8bcdacaed9d64f7b8870888 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 20 Apr 2024 21:38:27 +0800
Subject: [PATCH] 1

---
 server/mailserver/common/types.go | 1 +
 server/mailserver/mail/mail.go    | 2 +-
 server/mailserver/mail/mailmgr.go | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/mailserver/common/types.go b/server/mailserver/common/types.go
index 9d0d638a..8a691d23 100644
--- a/server/mailserver/common/types.go
+++ b/server/mailserver/common/types.go
@@ -44,6 +44,7 @@ type PlayerMgr interface {
 
 type Mail interface {
 	GetMailId() int64
+	IsValid(Player) bool
 }
 
 type MailMgr interface{
diff --git a/server/mailserver/mail/mail.go b/server/mailserver/mail/mail.go
index 403b7fc0..dc9297f3 100644
--- a/server/mailserver/mail/mail.go
+++ b/server/mailserver/mail/mail.go
@@ -38,7 +38,7 @@ func (this *mail) isType(mailType int32) bool {
 	return this.mailType == mailType
 }
 
-func (this *mail) isValid(hum common.Player) bool {
+func (this *mail) IsValid(hum common.Player) bool {
 	return true
 }
 
diff --git a/server/mailserver/mail/mailmgr.go b/server/mailserver/mail/mailmgr.go
index 68c52cb5..ea8c8b26 100644
--- a/server/mailserver/mail/mailmgr.go
+++ b/server/mailserver/mail/mailmgr.go
@@ -103,7 +103,7 @@ func (this *mailMgr) caGetMailList(hum common.Player, c *gin.Context) {
 	this.traversePlayerMail(
 		hum,
 		func (m *mail) bool {
-			if m.isValid(hum) {
+			if m.IsValid(hum) {
 				mailDto := new(common.MailDto)
 				if m.fillMailDto(mailDto) {
 					q5.AppendSlice(&rspObj.MailList, mailDto)
@@ -119,7 +119,7 @@ func (this *mailMgr) caMarkMail(hum common.Player, c *gin.Context) {
 	mails := []common.Mail{}
 	for _, str := range(mailIds) {
 		m := this.getMail(str)
-		if m != nil {
+		if m != nil && m.IsValid(hum) {
 			q5.AppendSlice(&mails, m)
 		}
 	}
@@ -140,7 +140,7 @@ func (this *mailMgr) caGetUnreadMailCnt(hum common.Player, c *gin.Context) {
 	this.traversePlayerMail(
 		hum,
 		func (m *mail) bool {
-			if m.isValid(hum) {
+			if m.IsValid(hum) {
 				rspObj.UnreadMailCnt++
 				return false
 			}
@@ -187,7 +187,7 @@ func (this *mailMgr) traversePlayerMail(hum common.Player, cb func(*mail) bool)
 	stop := false
 	traversFunc := func (k, v interface{}) bool {
 		m := v.(*mail)
-		if m.isValid(hum) {
+		if m.IsValid(hum) {
 			if !(cb(m)) {
 				stop = true
 				return false