From 0892c1c0c31935a1ce33f5c175e79c719a85575c Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:36:24 +0800
Subject: [PATCH] feat: add friend agree after callback (#2680)

---
 config/webhooks.yml               |  3 +++
 internal/rpc/relation/callback.go | 12 ++++++++++++
 internal/rpc/relation/friend.go   |  1 +
 pkg/callbackstruct/constant.go    |  1 +
 pkg/callbackstruct/friend.go      | 12 ++++++++++++
 pkg/common/config/config.go       |  1 +
 6 files changed, 30 insertions(+)

diff --git a/config/webhooks.yml b/config/webhooks.yml
index eee79c650..d8ed60214 100644
--- a/config/webhooks.yml
+++ b/config/webhooks.yml
@@ -151,6 +151,9 @@ beforeAddFriendAgree:
   enable: false
   timeout: 5
   failedContinue: true
+afterAddFriendAgree:
+  enable: false
+  timeout: 5
 afterDeleteFriend:
   enable: false
   timeout: 5
diff --git a/internal/rpc/relation/callback.go b/internal/rpc/relation/callback.go
index 69c4c9e0e..09debdea1 100644
--- a/internal/rpc/relation/callback.go
+++ b/internal/rpc/relation/callback.go
@@ -138,6 +138,18 @@ func (s *friendServer) webhookBeforeAddFriendAgree(ctx context.Context, before *
 	})
 }
 
+func (s *friendServer) webhookAfterAddFriendAgree(ctx context.Context, after *config.AfterConfig, req *relation.RespondFriendApplyReq) {
+	cbReq := &cbapi.CallbackAfterAddFriendAgreeReq{
+		CallbackCommand: cbapi.CallbackAfterAddFriendAgreeCommand,
+		FromUserID:      req.FromUserID,
+		ToUserID:        req.ToUserID,
+		HandleMsg:       req.HandleMsg,
+		HandleResult:    req.HandleResult,
+	}
+	resp := &cbapi.CallbackAfterAddFriendAgreeResp{}
+	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, resp, after)
+}
+
 func (s *friendServer) webhookBeforeImportFriends(ctx context.Context, before *config.BeforeConfig, req *relation.ImportFriendReq) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
 		cbReq := &cbapi.CallbackBeforeImportFriendsReq{
diff --git a/internal/rpc/relation/friend.go b/internal/rpc/relation/friend.go
index f049420d9..9d55ba4d9 100644
--- a/internal/rpc/relation/friend.go
+++ b/internal/rpc/relation/friend.go
@@ -212,6 +212,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *relation.Res
 		if err != nil {
 			return nil, err
 		}
+		s.webhookAfterAddFriendAgree(ctx, &s.config.WebhooksConfig.AfterAddFriendAgree, req)
 		s.notificationSender.FriendApplicationAgreedNotification(ctx, req)
 		return resp, nil
 	}
diff --git a/pkg/callbackstruct/constant.go b/pkg/callbackstruct/constant.go
index 5d136d3da..73f89a719 100644
--- a/pkg/callbackstruct/constant.go
+++ b/pkg/callbackstruct/constant.go
@@ -25,6 +25,7 @@ const (
 	CallbackBeforeAddBlackCommand           = "callbackBeforeAddBlackCommand"
 	CallbackAfterAddFriendCommand           = "callbackAfterAddFriendCommand"
 	CallbackBeforeAddFriendAgreeCommand     = "callbackBeforeAddFriendAgreeCommand"
+	CallbackAfterAddFriendAgreeCommand      = "callbackAfterAddFriendAgreeCommand"
 	CallbackAfterDeleteFriendCommand        = "callbackAfterDeleteFriendCommand"
 	CallbackBeforeImportFriendsCommand      = "callbackBeforeImportFriendsCommand"
 	CallbackAfterImportFriendsCommand       = "callbackAfterImportFriendsCommand"
diff --git a/pkg/callbackstruct/friend.go b/pkg/callbackstruct/friend.go
index 3674a34da..a81746bfd 100644
--- a/pkg/callbackstruct/friend.go
+++ b/pkg/callbackstruct/friend.go
@@ -90,6 +90,18 @@ type CallbackBeforeAddFriendAgreeResp struct {
 	CommonCallbackResp
 }
 
+type CallbackAfterAddFriendAgreeReq struct {
+	CallbackCommand `json:"callbackCommand"`
+	FromUserID      string `json:"fromUserID" `
+	ToUserID        string `json:"blackUserID"`
+	HandleResult    int32  `json:"HandleResult"`
+	HandleMsg       string `json:"HandleMsg"`
+}
+
+type CallbackAfterAddFriendAgreeResp struct {
+	CommonCallbackResp
+}
+
 type CallbackAfterDeleteFriendReq struct {
 	CallbackCommand `json:"callbackCommand"`
 	OwnerUserID     string `json:"ownerUserID" `
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 830b1ef9d..1b631fc3a 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -434,6 +434,7 @@ type Webhooks struct {
 	BeforeAddBlack           BeforeConfig `mapstructure:"beforeAddBlack"`
 	AfterAddFriend           AfterConfig  `mapstructure:"afterAddFriend"`
 	BeforeAddFriendAgree     BeforeConfig `mapstructure:"beforeAddFriendAgree"`
+	AfterAddFriendAgree      AfterConfig  `mapstructure:"afterAddFriendAgree"`
 	AfterDeleteFriend        AfterConfig  `mapstructure:"afterDeleteFriend"`
 	BeforeImportFriends      BeforeConfig `mapstructure:"beforeImportFriends"`
 	AfterImportFriends       AfterConfig  `mapstructure:"afterImportFriends"`