From 2228f5054dfbb5fff0038c424286f3381fd51c40 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 10 Feb 2025 22:24:09 +0800
Subject: [PATCH] :bug: Bug fixes on adding duplicate people into channel

---
 pkg/internal/services/channel_members.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/internal/services/channel_members.go b/pkg/internal/services/channel_members.go
index c7b17eb..3f8b4d5 100644
--- a/pkg/internal/services/channel_members.go
+++ b/pkg/internal/services/channel_members.go
@@ -60,13 +60,7 @@ func AddChannelMemberWithCheck(user, op authm.Account, target models.Channel) er
 		}
 	}
 
-	member := models.ChannelMember{
-		ChannelID: target.ID,
-		AccountID: user.ID,
-	}
-
-	err := database.C.Save(&member).Error
-	return err
+	return AddChannelMember(user, target)
 }
 
 func AddChannelMember(user authm.Account, target models.Channel) error {
@@ -75,7 +69,7 @@ func AddChannelMember(user authm.Account, target models.Channel) error {
 		AccountID: user.ID,
 		ChannelID: target.ID,
 	}).First(&member).Error; err == nil || !errors.Is(err, gorm.ErrRecordNotFound) {
-		return fmt.Errorf("the user is already in the channel")
+		return nil
 	}
 
 	member = models.ChannelMember{