From a1e414c30744951d0b7e54b3648aa159f802c473 Mon Sep 17 00:00:00 2001 From: AndrewZuo01 Date: Wed, 29 Nov 2023 11:06:08 +0800 Subject: [PATCH] update callback enable --- internal/rpc/friend/callback.go | 22 ---------------------- internal/rpc/group/callback.go | 13 ------------- internal/rpc/msg/callback.go | 4 ---- 3 files changed, 39 deletions(-) diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index ec845d8e0..d541071f5 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -17,7 +17,6 @@ package friend import ( "context" pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/utils" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -87,9 +86,6 @@ func CallbackBeforeAddBlack(ctx context.Context, req *pbfriend.AddBlackReq) erro } resp := &cbapi.CallbackBeforeAddBlackResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddBlack); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil @@ -106,9 +102,6 @@ func CallbackAfterAddFriend(ctx context.Context, req *pbfriend.ApplyToAddFriendR } resp := &cbapi.CallbackAfterAddFriendResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterAddFriend); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } @@ -127,9 +120,6 @@ func CallbackBeforeAddFriendAgree(ctx context.Context, req *pbfriend.RespondFrie } resp := &cbapi.CallbackBeforeAddFriendAgreeResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeAddFriendAgree); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil @@ -145,9 +135,6 @@ func CallbackAfterDeleteFriend(ctx context.Context, req *pbfriend.DeleteFriendRe } resp := &cbapi.CallbackAfterDeleteFriendResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterDeleteFriend); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil @@ -163,9 +150,6 @@ func CallbackBeforeImportFriends(ctx context.Context, req *pbfriend.ImportFriend } resp := &cbapi.CallbackBeforeImportFriendsResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackBeforeImportFriends); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } if len(resp.FriendUserIDs) != 0 { @@ -184,9 +168,6 @@ func CallbackAfterImportFriends(ctx context.Context, req *pbfriend.ImportFriendR } resp := &cbapi.CallbackAfterImportFriendsResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterImportFriends); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil @@ -203,9 +184,6 @@ func CallbackAfterRemoveBlack(ctx context.Context, req *pbfriend.RemoveBlackReq) } resp := &cbapi.CallbackAfterRemoveBlackResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, cbReq, resp, config.Config.Callback.CallbackAfterRemoveBlack); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index b237ed4bc..1599cc7b4 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,7 +16,6 @@ package group import ( "context" - "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" "time" @@ -176,9 +175,6 @@ func CallbackBeforeSetGroupMemberInfo(ctx context.Context, req *group.SetGroupMe config.Config.Callback.CallbackBeforeSetGroupMemberInfo, ) if err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } if resp.FaceURL != nil { @@ -349,9 +345,6 @@ func CallbackAfterJoinGroup(ctx context.Context, req *group.JoinGroupReq) error } resp := &callbackstruct.CallbackAfterJoinGroupResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterJoinGroup); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil @@ -386,9 +379,6 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) resp := &callbackstruct.CallbackBeforeSetGroupInfoResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackBeforeSetGroupInfo); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } @@ -433,9 +423,6 @@ func CallbackAfterSetGroupInfo(ctx context.Context, req *group.SetGroupInfoReq) } resp := &callbackstruct.CallbackAfterSetGroupInfoResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterSetGroupInfo); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } utils.StructFieldNotNilReplace(req, resp) diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index 06e1377f0..4ce5a5443 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -17,7 +17,6 @@ package msg import ( "context" "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/tools/errs" "google.golang.org/protobuf/proto" "github.com/OpenIMSDK/protocol/constant" @@ -199,9 +198,6 @@ func CallbackAfterRevokeMsg(ctx context.Context, req *pbchat.RevokeMsgReq) error } resp := &cbapi.CallbackAfterRevokeMsgResp{} if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, callbackReq, resp, config.Config.Callback.CallbackAfterRevokeMsg); err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } utils.StructFieldNotNilReplace(req, resp)