blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-26 21:22:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove unused paramaters.

Browse Source
This commit is contained in:
Monet Lee 2025-03-14 16:00:33 +08:00
parent cae28764e9
commit 8145f678af
2 changed files with 108 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
internal/rpc/conversation/callback.go
View File

@ -13,25 +13,18 @@ import (
func (c *conversationServer) webhookBeforeCreateSingleChatConversations(ctx context.Context, before *config.BeforeConfig, req *dbModel.Conversation) error { func (c *conversationServer) webhookBeforeCreateSingleChatConversations(ctx context.Context, before *config.BeforeConfig, req *dbModel.Conversation) error {
return webhook.WithCondition(ctx, before, func(ctx context.Context) error { return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
cbReq := &callbackstruct.CallbackBeforeCreateSingleChatConversationsReq{ cbReq := &callbackstruct.CallbackBeforeCreateSingleChatConversationsReq{
CallbackCommand: callbackstruct.CallbackBeforeCreateSingleChatConversationsCommand, CallbackCommand: callbackstruct.CallbackBeforeCreateSingleChatConversationsCommand,
OwnerUserID: req.OwnerUserID, OwnerUserID: req.OwnerUserID,
ConversationID: req.ConversationID, ConversationID: req.ConversationID,
ConversationType: req.ConversationType, ConversationType: req.ConversationType,
UserID: req.UserID, UserID: req.UserID,
GroupID: req.GroupID, RecvMsgOpt: req.RecvMsgOpt,
RecvMsgOpt: req.RecvMsgOpt, IsPinned: req.IsPinned,
IsPinned: req.IsPinned, IsPrivateChat: req.IsPrivateChat,
IsPrivateChat: req.IsPrivateChat, BurnDuration: req.BurnDuration,
BurnDuration: req.BurnDuration, GroupAtType: req.GroupAtType,
GroupAtType: req.GroupAtType, AttachedInfo: req.AttachedInfo,
AttachedInfo: req.AttachedInfo, Ex: req.Ex,
Ex: req.Ex,
MaxSeq: req.MaxSeq,
MinSeq: req.MinSeq,
CreateTime: req.CreateTime,
IsMsgDestruct: req.IsMsgDestruct,
MsgDestructTime: req.MsgDestructTime,
LatestMsgDestructTime: req.LatestMsgDestructTime,
} }
resp := &callbackstruct.CallbackBeforeCreateSingleChatConversationsResp{} resp := &callbackstruct.CallbackBeforeCreateSingleChatConversationsResp{}
@ -40,11 +33,6 @@ func (c *conversationServer) webhookBeforeCreateSingleChatConversations(ctx cont
return err return err
} }
datautil.NotNilReplace(&req.OwnerUserID, resp.OwnerUserID)
datautil.NotNilReplace(&req.ConversationID, resp.ConversationID)
datautil.NotNilReplace(&req.ConversationType, resp.ConversationType)
datautil.NotNilReplace(&req.UserID, resp.UserID)
datautil.NotNilReplace(&req.GroupID, resp.GroupID)
datautil.NotNilReplace(&req.RecvMsgOpt, resp.RecvMsgOpt) datautil.NotNilReplace(&req.RecvMsgOpt, resp.RecvMsgOpt)
datautil.NotNilReplace(&req.IsPinned, resp.IsPinned) datautil.NotNilReplace(&req.IsPinned, resp.IsPinned)
datautil.NotNilReplace(&req.IsPrivateChat, resp.IsPrivateChat) datautil.NotNilReplace(&req.IsPrivateChat, resp.IsPrivateChat)
@ -52,38 +40,24 @@ func (c *conversationServer) webhookBeforeCreateSingleChatConversations(ctx cont
datautil.NotNilReplace(&req.GroupAtType, resp.GroupAtType) datautil.NotNilReplace(&req.GroupAtType, resp.GroupAtType)
datautil.NotNilReplace(&req.AttachedInfo, resp.AttachedInfo) datautil.NotNilReplace(&req.AttachedInfo, resp.AttachedInfo)
datautil.NotNilReplace(&req.Ex, resp.Ex) datautil.NotNilReplace(&req.Ex, resp.Ex)
datautil.NotNilReplace(&req.MaxSeq, resp.MaxSeq)
datautil.NotNilReplace(&req.MinSeq, resp.MinSeq)
datautil.NotNilReplace(&req.CreateTime, resp.CreateTime)
datautil.NotNilReplace(&req.IsMsgDestruct, resp.IsMsgDestruct)
datautil.NotNilReplace(&req.MsgDestructTime, resp.MsgDestructTime)
datautil.NotNilReplace(&req.LatestMsgDestructTime, resp.LatestMsgDestructTime)
return nil return nil
}) })
} }
func (c *conversationServer) webhookAfterCreateSingleChatConversations(ctx context.Context, after *config.AfterConfig, req *dbModel.Conversation) error { func (c *conversationServer) webhookAfterCreateSingleChatConversations(ctx context.Context, after *config.AfterConfig, req *dbModel.Conversation) error {
cbReq := &callbackstruct.CallbackAfterCreateSingleChatConversationsReq{ cbReq := &callbackstruct.CallbackAfterCreateSingleChatConversationsReq{
CallbackCommand: callbackstruct.CallbackAfterCreateSingleChatConversationsCommand, CallbackCommand: callbackstruct.CallbackAfterCreateSingleChatConversationsCommand,
OwnerUserID: req.OwnerUserID, OwnerUserID: req.OwnerUserID,
ConversationID: req.ConversationID, ConversationID: req.ConversationID,
ConversationType: req.ConversationType, ConversationType: req.ConversationType,
UserID: req.UserID, UserID: req.UserID,
GroupID: req.GroupID, RecvMsgOpt: req.RecvMsgOpt,
RecvMsgOpt: req.RecvMsgOpt, IsPinned: req.IsPinned,
IsPinned: req.IsPinned, IsPrivateChat: req.IsPrivateChat,
IsPrivateChat: req.IsPrivateChat, BurnDuration: req.BurnDuration,
BurnDuration: req.BurnDuration, GroupAtType: req.GroupAtType,
GroupAtType: req.GroupAtType, AttachedInfo: req.AttachedInfo,
AttachedInfo: req.AttachedInfo, Ex: req.Ex,
Ex: req.Ex,
MaxSeq: req.MaxSeq,
MinSeq: req.MinSeq,
CreateTime: req.CreateTime,
IsMsgDestruct: req.IsMsgDestruct,
MsgDestructTime: req.MsgDestructTime,
LatestMsgDestructTime: req.LatestMsgDestructTime,
} }
c.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterCreateSingleChatConversationsResp{}, after) c.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterCreateSingleChatConversationsResp{}, after)
@ -93,23 +67,17 @@ func (c *conversationServer) webhookAfterCreateSingleChatConversations(ctx conte
func (c *conversationServer) webhookBeforeCreateGroupChatConversations(ctx context.Context, before *config.BeforeConfig, req *dbModel.Conversation) error { func (c *conversationServer) webhookBeforeCreateGroupChatConversations(ctx context.Context, before *config.BeforeConfig, req *dbModel.Conversation) error {
return webhook.WithCondition(ctx, before, func(ctx context.Context) error { return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
cbReq := &callbackstruct.CallbackBeforeCreateGroupChatConversationsReq{ cbReq := &callbackstruct.CallbackBeforeCreateGroupChatConversationsReq{
CallbackCommand: callbackstruct.CallbackBeforeCreateGroupChatConversationsCommand, CallbackCommand: callbackstruct.CallbackBeforeCreateGroupChatConversationsCommand,
ConversationID: req.ConversationID, ConversationID: req.ConversationID,
ConversationType: req.ConversationType, ConversationType: req.ConversationType,
GroupID: req.GroupID, GroupID: req.GroupID,
RecvMsgOpt: req.RecvMsgOpt, RecvMsgOpt: req.RecvMsgOpt,
IsPinned: req.IsPinned, IsPinned: req.IsPinned,
IsPrivateChat: req.IsPrivateChat, IsPrivateChat: req.IsPrivateChat,
BurnDuration: req.BurnDuration, BurnDuration: req.BurnDuration,
GroupAtType: req.GroupAtType, GroupAtType: req.GroupAtType,
AttachedInfo: req.AttachedInfo, AttachedInfo: req.AttachedInfo,
Ex: req.Ex, Ex: req.Ex,
MaxSeq: req.MaxSeq,
MinSeq: req.MinSeq,
CreateTime: req.CreateTime,
IsMsgDestruct: req.IsMsgDestruct,
MsgDestructTime: req.MsgDestructTime,
LatestMsgDestructTime: req.LatestMsgDestructTime,
} }
resp := &callbackstruct.CallbackBeforeCreateGroupChatConversationsResp{} resp := &callbackstruct.CallbackBeforeCreateGroupChatConversationsResp{}
@ -118,9 +86,6 @@ func (c *conversationServer) webhookBeforeCreateGroupChatConversations(ctx conte
return err return err
} }
datautil.NotNilReplace(&req.ConversationID, resp.ConversationID)
datautil.NotNilReplace(&req.ConversationType, resp.ConversationType)
datautil.NotNilReplace(&req.GroupID, resp.GroupID)
datautil.NotNilReplace(&req.RecvMsgOpt, resp.RecvMsgOpt) datautil.NotNilReplace(&req.RecvMsgOpt, resp.RecvMsgOpt)
datautil.NotNilReplace(&req.IsPinned, resp.IsPinned) datautil.NotNilReplace(&req.IsPinned, resp.IsPinned)
datautil.NotNilReplace(&req.IsPrivateChat, resp.IsPrivateChat) datautil.NotNilReplace(&req.IsPrivateChat, resp.IsPrivateChat)
@ -128,35 +93,23 @@ func (c *conversationServer) webhookBeforeCreateGroupChatConversations(ctx conte
datautil.NotNilReplace(&req.GroupAtType, resp.GroupAtType) datautil.NotNilReplace(&req.GroupAtType, resp.GroupAtType)
datautil.NotNilReplace(&req.AttachedInfo, resp.AttachedInfo) datautil.NotNilReplace(&req.AttachedInfo, resp.AttachedInfo)
datautil.NotNilReplace(&req.Ex, resp.Ex) datautil.NotNilReplace(&req.Ex, resp.Ex)
datautil.NotNilReplace(&req.MaxSeq, resp.MaxSeq)
datautil.NotNilReplace(&req.MinSeq, resp.MinSeq)
datautil.NotNilReplace(&req.CreateTime, resp.CreateTime)
datautil.NotNilReplace(&req.IsMsgDestruct, resp.IsMsgDestruct)
datautil.NotNilReplace(&req.MsgDestructTime, resp.MsgDestructTime)
datautil.NotNilReplace(&req.LatestMsgDestructTime, resp.LatestMsgDestructTime)
return nil return nil
}) })
} }
func (c *conversationServer) webhookAfterCreateGroupChatConversations(ctx context.Context, after *config.AfterConfig, req *dbModel.Conversation) error { func (c *conversationServer) webhookAfterCreateGroupChatConversations(ctx context.Context, after *config.AfterConfig, req *dbModel.Conversation) error {
cbReq := &callbackstruct.CallbackAfterCreateGroupChatConversationsReq{ cbReq := &callbackstruct.CallbackAfterCreateGroupChatConversationsReq{
CallbackCommand: callbackstruct.CallbackAfterCreateGroupChatConversationsCommand, CallbackCommand: callbackstruct.CallbackAfterCreateGroupChatConversationsCommand,
ConversationID: req.ConversationID, ConversationID: req.ConversationID,
ConversationType: req.ConversationType, ConversationType: req.ConversationType,
GroupID: req.GroupID, GroupID: req.GroupID,
RecvMsgOpt: req.RecvMsgOpt, RecvMsgOpt: req.RecvMsgOpt,
IsPinned: req.IsPinned, IsPinned: req.IsPinned,
IsPrivateChat: req.IsPrivateChat, IsPrivateChat: req.IsPrivateChat,
BurnDuration: req.BurnDuration, BurnDuration: req.BurnDuration,
GroupAtType: req.GroupAtType, GroupAtType: req.GroupAtType,
AttachedInfo: req.AttachedInfo, AttachedInfo: req.AttachedInfo,
Ex: req.Ex, Ex: req.Ex,
MaxSeq: req.MaxSeq,
MinSeq: req.MinSeq,
CreateTime: req.CreateTime,
IsMsgDestruct: req.IsMsgDestruct,
MsgDestructTime: req.MsgDestructTime,
LatestMsgDestructTime: req.LatestMsgDestructTime,
} }
c.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterCreateGroupChatConversationsResp{}, after) c.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterCreateGroupChatConversationsResp{}, after)

199
pkg/callbackstruct/conversation.go
View File

@ -1,94 +1,44 @@
package callbackstruct package callbackstruct
import (
"time"
)
type Conversation struct {
OwnerUserID string `json:"owner_user_id"`
ConversationID string `json:"conversation_id"`
ConversationType int32 `json:"conversation_type"`
UserID string `json:"user_id"`
GroupID string `json:"group_id"`
RecvMsgOpt int32 `json:"recv_msg_opt"`
IsPinned bool `json:"is_pinned"`
IsPrivateChat bool `json:"is_private_chat"`
BurnDuration int32 `json:"burn_duration"`
GroupAtType int32 `json:"group_at_type"`
AttachedInfo string `json:"attached_info"`
Ex string `json:"ex"`
MaxSeq int64 `json:"max_seq"`
MinSeq int64 `json:"min_seq"`
CreateTime time.Time `json:"create_time"`
IsMsgDestruct bool `json:"is_msg_destruct"`
MsgDestructTime int64 `json:"msg_destruct_time"`
LatestMsgDestructTime time.Time `json:"latest_msg_destruct_time"`
}
type CallbackBeforeCreateSingleChatConversationsReq struct { type CallbackBeforeCreateSingleChatConversationsReq struct {
CallbackCommand `json:"callbackCommand"` CallbackCommand `json:"callbackCommand"`
OwnerUserID string `json:"owner_user_id"` OwnerUserID string `json:"owner_user_id"`
ConversationID string `json:"conversation_id"` ConversationID string `json:"conversation_id"`
ConversationType int32 `json:"conversation_type"` ConversationType int32 `json:"conversation_type"`
UserID string `json:"user_id"` UserID string `json:"user_id"`
GroupID string `json:"group_id"` RecvMsgOpt int32 `json:"recv_msg_opt"`
RecvMsgOpt int32 `json:"recv_msg_opt"` IsPinned bool `json:"is_pinned"`
IsPinned bool `json:"is_pinned"` IsPrivateChat bool `json:"is_private_chat"`
IsPrivateChat bool `json:"is_private_chat"` BurnDuration int32 `json:"burn_duration"`
BurnDuration int32 `json:"burn_duration"` GroupAtType int32 `json:"group_at_type"`
GroupAtType int32 `json:"group_at_type"` AttachedInfo string `json:"attached_info"`
AttachedInfo string `json:"attached_info"` Ex string `json:"ex"`
Ex string `json:"ex"`
MaxSeq int64 `json:"max_seq"`
MinSeq int64 `json:"min_seq"`
CreateTime time.Time `json:"create_time"`
IsMsgDestruct bool `json:"is_msg_destruct"`
MsgDestructTime int64 `json:"msg_destruct_time"`
LatestMsgDestructTime time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackBeforeCreateSingleChatConversationsResp struct { type CallbackBeforeCreateSingleChatConversationsResp struct {
CommonCallbackResp CommonCallbackResp
OwnerUserID *string `json:"owner_user_id"` RecvMsgOpt *int32 `json:"recv_msg_opt"`
ConversationID *string `json:"conversation_id"` IsPinned *bool `json:"is_pinned"`
ConversationType *int32 `json:"conversation_type"` IsPrivateChat *bool `json:"is_private_chat"`
UserID *string `json:"user_id"` BurnDuration *int32 `json:"burn_duration"`
GroupID *string `json:"group_id"` GroupAtType *int32 `json:"group_at_type"`
RecvMsgOpt *int32 `json:"recv_msg_opt"` AttachedInfo *string `json:"attached_info"`
IsPinned *bool `json:"is_pinned"` Ex *string `json:"ex"`
IsPrivateChat *bool `json:"is_private_chat"`
BurnDuration *int32 `json:"burn_duration"`
GroupAtType *int32 `json:"group_at_type"`
AttachedInfo *string `json:"attached_info"`
Ex *string `json:"ex"`
MaxSeq *int64 `json:"max_seq"`
MinSeq *int64 `json:"min_seq"`
CreateTime *time.Time `json:"create_time"`
IsMsgDestruct *bool `json:"is_msg_destruct"`
MsgDestructTime *int64 `json:"msg_destruct_time"`
LatestMsgDestructTime *time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackAfterCreateSingleChatConversationsReq struct { type CallbackAfterCreateSingleChatConversationsReq struct {
CallbackCommand `json:"callbackCommand"` CallbackCommand `json:"callbackCommand"`
OwnerUserID string `json:"owner_user_id"` OwnerUserID string `json:"owner_user_id"`
ConversationID string `json:"conversation_id"` ConversationID string `json:"conversation_id"`
ConversationType int32 `json:"conversation_type"` ConversationType int32 `json:"conversation_type"`
UserID string `json:"user_id"` UserID string `json:"user_id"`
GroupID string `json:"group_id"` RecvMsgOpt int32 `json:"recv_msg_opt"`
RecvMsgOpt int32 `json:"recv_msg_opt"` IsPinned bool `json:"is_pinned"`
IsPinned bool `json:"is_pinned"` IsPrivateChat bool `json:"is_private_chat"`
IsPrivateChat bool `json:"is_private_chat"` BurnDuration int32 `json:"burn_duration"`
BurnDuration int32 `json:"burn_duration"` GroupAtType int32 `json:"group_at_type"`
GroupAtType int32 `json:"group_at_type"` AttachedInfo string `json:"attached_info"`
AttachedInfo string `json:"attached_info"` Ex string `json:"ex"`
Ex string `json:"ex"`
MaxSeq int64 `json:"max_seq"`
MinSeq int64 `json:"min_seq"`
CreateTime time.Time `json:"create_time"`
IsMsgDestruct bool `json:"is_msg_destruct"`
MsgDestructTime int64 `json:"msg_destruct_time"`
LatestMsgDestructTime time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackAfterCreateSingleChatConversationsResp struct { type CallbackAfterCreateSingleChatConversationsResp struct {
@ -96,69 +46,44 @@ type CallbackAfterCreateSingleChatConversationsResp struct {
} }
type CallbackBeforeCreateGroupChatConversationsReq struct { type CallbackBeforeCreateGroupChatConversationsReq struct {
CallbackCommand `json:"callbackCommand"` CallbackCommand `json:"callbackCommand"`
OwnerUserID string `json:"owner_user_id"` OwnerUserID string `json:"owner_user_id"`
ConversationID string `json:"conversation_id"` ConversationID string `json:"conversation_id"`
ConversationType int32 `json:"conversation_type"` ConversationType int32 `json:"conversation_type"`
UserID string `json:"user_id"` GroupID string `json:"group_id"`
GroupID string `json:"group_id"` RecvMsgOpt int32 `json:"recv_msg_opt"`
RecvMsgOpt int32 `json:"recv_msg_opt"` IsPinned bool `json:"is_pinned"`
IsPinned bool `json:"is_pinned"` IsPrivateChat bool `json:"is_private_chat"`
IsPrivateChat bool `json:"is_private_chat"` BurnDuration int32 `json:"burn_duration"`
BurnDuration int32 `json:"burn_duration"` GroupAtType int32 `json:"group_at_type"`
GroupAtType int32 `json:"group_at_type"` AttachedInfo string `json:"attached_info"`
AttachedInfo string `json:"attached_info"` Ex string `json:"ex"`
Ex string `json:"ex"`
MaxSeq int64 `json:"max_seq"`
MinSeq int64 `json:"min_seq"`
CreateTime time.Time `json:"create_time"`
IsMsgDestruct bool `json:"is_msg_destruct"`
MsgDestructTime int64 `json:"msg_destruct_time"`
LatestMsgDestructTime time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackBeforeCreateGroupChatConversationsResp struct { type CallbackBeforeCreateGroupChatConversationsResp struct {
CommonCallbackResp CommonCallbackResp
OwnerUserID *string `json:"owner_user_id"` RecvMsgOpt *int32 `json:"recv_msg_opt"`
ConversationID *string `json:"conversation_id"` IsPinned *bool `json:"is_pinned"`
ConversationType *int32 `json:"conversation_type"` IsPrivateChat *bool `json:"is_private_chat"`
UserID *string `json:"user_id"` BurnDuration *int32 `json:"burn_duration"`
GroupID *string `json:"group_id"` GroupAtType *int32 `json:"group_at_type"`
RecvMsgOpt *int32 `json:"recv_msg_opt"` AttachedInfo *string `json:"attached_info"`
IsPinned *bool `json:"is_pinned"` Ex *string `json:"ex"`
IsPrivateChat *bool `json:"is_private_chat"`
BurnDuration *int32 `json:"burn_duration"`
GroupAtType *int32 `json:"group_at_type"`
AttachedInfo *string `json:"attached_info"`
Ex *string `json:"ex"`
MaxSeq *int64 `json:"max_seq"`
MinSeq *int64 `json:"min_seq"`
CreateTime *time.Time `json:"create_time"`
IsMsgDestruct *bool `json:"is_msg_destruct"`
MsgDestructTime *int64 `json:"msg_destruct_time"`
LatestMsgDestructTime *time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackAfterCreateGroupChatConversationsReq struct { type CallbackAfterCreateGroupChatConversationsReq struct {
CallbackCommand `json:"callbackCommand"` CallbackCommand `json:"callbackCommand"`
OwnerUserID string `json:"owner_user_id"` OwnerUserID string `json:"owner_user_id"`
ConversationID string `json:"conversation_id"` ConversationID string `json:"conversation_id"`
ConversationType int32 `json:"conversation_type"` ConversationType int32 `json:"conversation_type"`
UserID string `json:"user_id"` GroupID string `json:"group_id"`
GroupID string `json:"group_id"` RecvMsgOpt int32 `json:"recv_msg_opt"`
RecvMsgOpt int32 `json:"recv_msg_opt"` IsPinned bool `json:"is_pinned"`
IsPinned bool `json:"is_pinned"` IsPrivateChat bool `json:"is_private_chat"`
IsPrivateChat bool `json:"is_private_chat"` BurnDuration int32 `json:"burn_duration"`
BurnDuration int32 `json:"burn_duration"` GroupAtType int32 `json:"group_at_type"`
GroupAtType int32 `json:"group_at_type"` AttachedInfo string `json:"attached_info"`
AttachedInfo string `json:"attached_info"` Ex string `json:"ex"`
Ex string `json:"ex"`
MaxSeq int64 `json:"max_seq"`
MinSeq int64 `json:"min_seq"`
CreateTime time.Time `json:"create_time"`
IsMsgDestruct bool `json:"is_msg_destruct"`
MsgDestructTime int64 `json:"msg_destruct_time"`
LatestMsgDestructTime time.Time `json:"latest_msg_destruct_time"`
} }
type CallbackAfterCreateGroupChatConversationsResp struct { type CallbackAfterCreateGroupChatConversationsResp struct {