diff --git a/client/builders.go b/client/builders.go
index a9389cec..b7bd6a74 100644
--- a/client/builders.go
+++ b/client/builders.go
@@ -1260,7 +1260,7 @@ func (c *QQClient) buildWordSegmentationPacket(data []byte) (uint16, []byte) {
 }
 
 // OidbSvc.0xdad_1
-func (c *QQClient) sendGroupGiftPacket(groupCode, uin uint64, productId GroupGift) (uint16, []byte) {
+func (c *QQClient) sendGroupGiftPacket(groupCode, uin uint64, productId message.GroupGift) (uint16, []byte) {
 	seq := c.nextSeq()
 	body := &oidb.DADReqBody{
 		Client:    1,
diff --git a/client/client.go b/client/client.go
index acfb0cde..cd52577e 100644
--- a/client/client.go
+++ b/client/client.go
@@ -954,7 +954,7 @@ func (c *QQClient) SetCustomServer(servers []*net.TCPAddr) {
 	c.servers = append(servers, c.servers...)
 }
 
-func (c *QQClient) SendGroupGift(groupCode, uin uint64, gift GroupGift) {
+func (c *QQClient) SendGroupGift(groupCode, uin uint64, gift message.GroupGift) {
 	_, packet := c.sendGroupGiftPacket(groupCode, uin, gift)
 	_ = c.send(packet)
 }
diff --git a/client/entities.go b/client/entities.go
index ee299894..2be8d755 100644
--- a/client/entities.go
+++ b/client/entities.go
@@ -19,8 +19,6 @@ type (
 
 	ClientProtocol int
 
-	GroupGift int
-
 	LoginResponse struct {
 		Success bool
 		Error   LoginError
@@ -254,15 +252,6 @@ const (
 	AndroidPad   ClientProtocol = 537062409
 	AndroidWatch ClientProtocol = 537061176
 
-	SweetWink      GroupGift = 285
-	HappyCola      GroupGift = 289
-	LuckyBracelet  GroupGift = 290
-	Cappuccino     GroupGift = 299
-	CatWatch       GroupGift = 302
-	FleeceGloves   GroupGift = 302
-	RainbowCandy   GroupGift = 308
-	Stronger       GroupGift = 313
-	LoveMicrophone GroupGift = 367
 )
 
 func (g *GroupInfo) UpdateName(newName string) {
diff --git a/message/message.go b/message/message.go
index a4eb863d..73f6989b 100644
--- a/message/message.go
+++ b/message/message.go
@@ -70,6 +70,8 @@ type (
 	}
 
 	ElementType int
+
+	GroupGift int
 )
 
 const (
@@ -85,6 +87,16 @@ const (
 	Video
 	LightApp
 	RedBag
+
+	SweetWink      GroupGift = 285
+	HappyCola      GroupGift = 289
+	LuckyBracelet  GroupGift = 290
+	Cappuccino     GroupGift = 299
+	CatWatch       GroupGift = 302
+	FleeceGloves   GroupGift = 302
+	RainbowCandy   GroupGift = 308
+	Stronger       GroupGift = 313
+	LoveMicrophone GroupGift = 367
 )
 
 func (s *Sender) IsAnonymous() bool {