optimize(oidb): apply generic ParseTypedError

LagrangeDev · Jun 20, 2024 · e45af9e · e45af9e
1 parent f5d774d
commit e45af9e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 50 deletions.
diff --git a/client/packets/oidb/FetchGroupRequests.go b/client/packets/oidb/FetchGroupRequests.go
@@ -1,8 +1,6 @@
 package oidb
 
 import (
-	"errors"
-
 	"github.com/LagrangeDev/LagrangeGo/client/packets/pb/service/oidb"
 )
 
@@ -15,13 +13,5 @@ func BuildFetchGroupRequestsReq() (*OidbPacket, error) {
 }
 
 func ParseFetchGroupRequestsReq(data []byte) (*oidb.OidbSvcTrpcTcp0X10C0_1Response, error) {
-	var resp oidb.OidbSvcTrpcTcp0X10C0_1Response
-	baseResp, err := ParseOidbPacket(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if baseResp.ErrorCode != 0 {
-		return nil, errors.New(baseResp.ErrorMsg)
-	}
-	return &resp, nil
+	return ParseTypedError[oidb.OidbSvcTrpcTcp0X10C0_1Response](data)
 }
diff --git a/client/packets/oidb/GroupImageUpload.go b/client/packets/oidb/GroupImageUpload.go
@@ -95,14 +95,5 @@ func BuildGroupImageUploadReq(groupUin uint32, image *message.ImageElement) (*Oi
 }
 
 func ParseGroupImageUploadResp(data []byte) (*oidb.NTV2RichMediaResp, error) { // TODO: return proper response
-	var resp oidb.NTV2RichMediaResp
-	baseResp, err := ParseOidbPacket(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if baseResp.ErrorCode != 0 {
-		return nil, errors.New(baseResp.ErrorMsg)
-	}
-
-	return &resp, nil
+	return ParseTypedError[oidb.NTV2RichMediaResp](data)
 }
diff --git a/client/packets/oidb/GroupRecordUpload.go b/client/packets/oidb/GroupRecordUpload.go
@@ -80,14 +80,5 @@ func BuildGroupRecordUploadReq(groupCode uint32, record *message.VoiceElement) (
 }
 
 func ParseGroupRecordUploadResp(data []byte) (*oidb.NTV2RichMediaResp, error) {
-	var resp oidb.NTV2RichMediaResp
-	baseResp, err := ParseOidbPacket(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if baseResp.ErrorCode != 0 {
-		return nil, errors.New(baseResp.ErrorMsg)
-	}
-
-	return &resp, nil
+	return ParseTypedError[oidb.NTV2RichMediaResp](data)
 }
diff --git a/client/packets/oidb/PrivateImageUpload.go b/client/packets/oidb/PrivateImageUpload.go
@@ -96,13 +96,5 @@ func BuildPrivateImageUploadReq(targetUid string, image *message.ImageElement) (
 }
 
 func ParsePrivateImageUploadResp(data []byte) (*oidb.NTV2RichMediaResp, error) {
-	var resp oidb.NTV2RichMediaResp
-	baseResp, err := ParseOidbPacket(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if baseResp.ErrorCode != 0 {
-		return nil, errors.New(baseResp.ErrorMsg)
-	}
-	return &resp, nil
+	return ParseTypedError[oidb.NTV2RichMediaResp](data)
 }
diff --git a/client/packets/oidb/PrivateRecordUpload.go b/client/packets/oidb/PrivateRecordUpload.go
@@ -75,14 +75,5 @@ func BuildPrivateRecordUploadReq(targetUid string, record *message.VoiceElement)
 }
 
 func ParsePrivateRecordUploadResp(data []byte) (*oidb.NTV2RichMediaResp, error) {
-	var resp oidb.NTV2RichMediaResp
-	baseResp, err := ParseOidbPacket(data, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if baseResp.ErrorCode != 0 {
-		return nil, errors.New(baseResp.ErrorMsg)
-	}
-
-	return &resp, nil
+	return ParseTypedError[oidb.NTV2RichMediaResp](data)
 }
diff --git a/client/packets/oidb/builder.go b/client/packets/oidb/builder.go
@@ -77,3 +77,15 @@ func CheckTypedError[T any](data []byte) error {
 	}
 	return nil
 }
+
+func ParseTypedError[T any](data []byte) (*T, error) {
+	var resp T
+	baseResp, err := ParseOidbPacket(data, &resp)
+	if err != nil {
+		return nil, err
+	}
+	if baseResp.ErrorCode != 0 {
+		return nil, errors.New(baseResp.ErrorMsg)
+	}
+	return &resp, nil
+}