From 827e673e140389f51959154b84b7d4a9eb117d43 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:27:14 +0800 Subject: [PATCH] refactor: webhooks update --- config/webhooks.yml | 22 +++------ pkg/common/config/config.go | 93 ++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 64 deletions(-) diff --git a/config/webhooks.yml b/config/webhooks.yml index 9f6510e0e..5f583ed33 100644 --- a/config/webhooks.yml +++ b/config/webhooks.yml @@ -75,31 +75,27 @@ afterSetGroupMemberInfo: enable: false timeout: 5 failedContinue: true -quitGroup: +afterQuitGroup: enable: false timeout: 5 failedContinue: true -killGroupMember: +afterKickGroupMember: enable: false timeout: 5 failedContinue: true -dismissGroup: +afterDismissGroup: enable: false timeout: 5 failedContinue: true -joinGroup: +beforeApplyJoinGroup: enable: false timeout: 5 failedContinue: true -groupMsgRead: - enable: false - timeout: 5 - failedContinue: true -singleMsgRead: +afterGroupMsgRead: enable: false timeout: 5 failedContinue: true -updateUserInfo: +afterSingleMsgRead: enable: false timeout: 5 failedContinue: true @@ -111,7 +107,7 @@ afterUserRegister: enable: false timeout: 5 failedContinue: true -transferGroupOwner: +afterTransferGroupOwner: enable: false timeout: 5 failedContinue: true @@ -123,10 +119,6 @@ afterSetFriendRemark: enable: false timeout: 5 failedContinue: true -afterGroupMsgRead: - enable: false - timeout: 5 - failedContinue: true afterGroupMsgRevoke: enable: false timeout: 5 diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 479443251..855464d18 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -344,55 +344,50 @@ type IMAdmin struct { } type Webhooks struct { - URL string `mapstructure:"url"` - BeforeSendSingleMsg WebhookConfig `mapstructure:"beforeSendSingleMsg"` - BeforeUpdateUserInfoEx WebhookConfig `mapstructure:"beforeUpdateUserInfoEx"` - AfterUpdateUserInfoEx WebhookConfig `mapstructure:"afterUpdateUserInfoEx"` - AfterSendSingleMsg WebhookConfig `mapstructure:"afterSendSingleMsg"` - BeforeSendGroupMsg WebhookConfig `mapstructure:"beforeSendGroupMsg"` - AfterSendGroupMsg WebhookConfig `mapstructure:"afterSendGroupMsg"` - MsgModify WebhookConfig `mapstructure:"msgModify"` - UserOnline WebhookConfig `mapstructure:"userOnline"` - UserOffline WebhookConfig `mapstructure:"userOffline"` - UserKickOff WebhookConfig `mapstructure:"userKickOff"` - OfflinePush WebhookConfig `mapstructure:"offlinePush"` - OnlinePush WebhookConfig `mapstructure:"onlinePush"` - GroupOnlinePush WebhookConfig `mapstructure:"groupOnlinePush"` - BeforeAddFriend WebhookConfig `mapstructure:"beforeAddFriend"` - BeforeUpdateUserInfo WebhookConfig `mapstructure:"beforeUpdateUserInfo"` - BeforeCreateGroup WebhookConfig `mapstructure:"beforeCreateGroup"` - AfterCreateGroup WebhookConfig `mapstructure:"afterCreateGroup"` - BeforeMemberJoinGroup WebhookConfig `mapstructure:"beforeMemberJoinGroup"` - BeforeSetGroupMemberInfo WebhookConfig `mapstructure:"beforeSetGroupMemberInfo"` - AfterSetGroupMemberInfo WebhookConfig `mapstructure:"afterSetGroupMemberInfo"` - SetMessageReactionExtensions WebhookConfig `mapstructure:"setMessageReactionExtensions"` - QuitGroup WebhookConfig `mapstructure:"quitGroup"` - KillGroupMember WebhookConfig `mapstructure:"killGroupMember"` - DismissGroup WebhookConfig `mapstructure:"dismissGroup"` - JoinGroup WebhookConfig `mapstructure:"joinGroup"` - GroupMsgRead WebhookConfig `mapstructure:"groupMsgRead"` - SingleMsgRead WebhookConfig `mapstructure:"singleMsgRead"` - UpdateUserInfo WebhookConfig `mapstructure:"updateUserInfo"` - BeforeUserRegister WebhookConfig `mapstructure:"beforeUserRegister"` - AfterUserRegister WebhookConfig `mapstructure:"afterUserRegister"` - TransferGroupOwner WebhookConfig `mapstructure:"transferGroupOwner"` - BeforeSetFriendRemark WebhookConfig `mapstructure:"beforeSetFriendRemark"` - AfterSetFriendRemark WebhookConfig `mapstructure:"afterSetFriendRemark"` - AfterGroupMsgRead WebhookConfig `mapstructure:"afterGroupMsgRead"` - AfterGroupMsgRevoke WebhookConfig `mapstructure:"afterGroupMsgRevoke"` - AfterJoinGroup WebhookConfig `mapstructure:"afterJoinGroup"` - BeforeInviteUserToGroup WebhookConfig `mapstructure:"beforeInviteUserToGroup"` - JoinGroupAfter WebhookConfig `mapstructure:"joinGroupAfter"` - SetGroupInfoAfter WebhookConfig `mapstructure:"setGroupInfoAfter"` - SetGroupInfoBefore WebhookConfig `mapstructure:"setGroupInfoBefore"` - RevokeMsgAfter WebhookConfig `mapstructure:"revokeMsgAfter"` - AddBlackBefore WebhookConfig `mapstructure:"addBlackBefore"` - AddFriendAfter WebhookConfig `mapstructure:"addFriendAfter"` - AddFriendAgreeBefore WebhookConfig `mapstructure:"addFriendAgreeBefore"` - DeleteFriendAfter WebhookConfig `mapstructure:"deleteFriendAfter"` - ImportFriendsBefore WebhookConfig `mapstructure:"importFriendsBefore"` - ImportFriendsAfter WebhookConfig `mapstructure:"importFriendsAfter"` - RemoveBlackAfter WebhookConfig `mapstructure:"removeBlackAfter"` + URL string `mapstructure:"url"` + BeforeSendSingleMsg WebhookConfig `mapstructure:"beforeSendSingleMsg"` + BeforeUpdateUserInfoEx WebhookConfig `mapstructure:"beforeUpdateUserInfoEx"` + AfterUpdateUserInfoEx WebhookConfig `mapstructure:"afterUpdateUserInfoEx"` + AfterSendSingleMsg WebhookConfig `mapstructure:"afterSendSingleMsg"` + BeforeSendGroupMsg WebhookConfig `mapstructure:"beforeSendGroupMsg"` + AfterSendGroupMsg WebhookConfig `mapstructure:"afterSendGroupMsg"` + AfterUserOnline WebhookConfig `mapstructure:"afterUserOnline"` + AfterUserOffline WebhookConfig `mapstructure:"afterUserOffline"` + AfterUserKickOff WebhookConfig `mapstructure:"afterUserKickOff"` + BeforeOfflinePush WebhookConfig `mapstructure:"beforeOfflinePush"` + BeforeOnlinePush WebhookConfig `mapstructure:"beforeOnlinePush"` + BeforeGroupOnlinePush WebhookConfig `mapstructure:"beforeGroupOnlinePush"` + BeforeAddFriend WebhookConfig `mapstructure:"beforeAddFriend"` + BeforeUpdateUserInfo WebhookConfig `mapstructure:"beforeUpdateUserInfo"` + BeforeCreateGroup WebhookConfig `mapstructure:"beforeCreateGroup"` + AfterCreateGroup WebhookConfig `mapstructure:"afterCreateGroup"` + BeforeMemberJoinGroup WebhookConfig `mapstructure:"beforeMemberJoinGroup"` + BeforeSetGroupMemberInfo WebhookConfig `mapstructure:"beforeSetGroupMemberInfo"` + AfterSetGroupMemberInfo WebhookConfig `mapstructure:"afterSetGroupMemberInfo"` + AfterQuitGroup WebhookConfig `mapstructure:"afterQuitGroup"` + AfterKickGroupMember WebhookConfig `mapstructure:"afterKickGroupMember"` + AfterDismissGroup WebhookConfig `mapstructure:"afterDismissGroup"` + BeforeApplyJoinGroup WebhookConfig `mapstructure:"beforeApplyJoinGroup"` + AfterGroupMsgRead WebhookConfig `mapstructure:"afterGroupMsgRead"` + AfterSingleMsgRead WebhookConfig `mapstructure:"afterSingleMsgRead"` + BeforeUserRegister WebhookConfig `mapstructure:"beforeUserRegister"` + AfterUserRegister WebhookConfig `mapstructure:"afterUserRegister"` + AfterTransferGroupOwner WebhookConfig `mapstructure:"afterTransferGroupOwner"` + BeforeSetFriendRemark WebhookConfig `mapstructure:"beforeSetFriendRemark"` + AfterSetFriendRemark WebhookConfig `mapstructure:"afterSetFriendRemark"` + AfterGroupMsgRevoke WebhookConfig `mapstructure:"afterGroupMsgRevoke"` + AfterJoinGroup WebhookConfig `mapstructure:"afterJoinGroup"` + BeforeInviteUserToGroup WebhookConfig `mapstructure:"beforeInviteUserToGroup"` + AfterSetGroupInfo WebhookConfig `mapstructure:"afterSetGroupInfo"` + BeforeSetGroupInfo WebhookConfig `mapstructure:"beforeSetGroupInfo"` + AfterRevokeMsg WebhookConfig `mapstructure:"afterRevokeMsg"` + BeforeAddBlack WebhookConfig `mapstructure:"beforeAddBlack"` + AfterAddFriend WebhookConfig `mapstructure:"afterAddFriend"` + BeforeAddFriendAgree WebhookConfig `mapstructure:"beforeAddFriendAgree"` + AfterDeleteFriend WebhookConfig `mapstructure:"afterDeleteFriend"` + BeforeImportFriends WebhookConfig `mapstructure:"beforeImportFriends"` + AfterImportFriends WebhookConfig `mapstructure:"afterImportFriends"` + AfterRemoveBlack WebhookConfig `mapstructure:"afterRemoveBlack"` } type ZooKeeper struct {