mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-11-03 01:52:17 +08:00
fix: del code
This commit is contained in:
parent
24e205e2fb
commit
9c9294610f
@ -535,28 +535,7 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
|
|||||||
if err := g.conversationRpcClient.GroupChatFirstCreateConversation(ctx, groupID, entrantUserID); err != nil {
|
if err := g.conversationRpcClient.GroupChatFirstCreateConversation(ctx, groupID, entrantUserID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
opUserID := mcontext.GetOpUserID(ctx)
|
|
||||||
var opUser *sdkws.GroupMemberFullInfo
|
|
||||||
if authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID) {
|
|
||||||
opUser = &sdkws.GroupMemberFullInfo{
|
|
||||||
GroupID: groupID,
|
|
||||||
UserID: opUserID,
|
|
||||||
AppMangerLevel: constant.AppAdmin,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
users, err := g.getGroupMembers(ctx, groupID, []string{opUserID})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if len(users) == 0 {
|
|
||||||
opUser = &sdkws.GroupMemberFullInfo{
|
|
||||||
GroupID: groupID,
|
|
||||||
UserID: opUserID,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
opUser = users[0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var group *sdkws.GroupInfo
|
var group *sdkws.GroupInfo
|
||||||
group, err = g.getGroupInfo(ctx, groupID)
|
group, err = g.getGroupInfo(ctx, groupID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -566,7 +545,8 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users, OpUser: opUser}
|
|
||||||
|
tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users}
|
||||||
if err = g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
|
if err = g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user