Fixed a bug where when kicking a member, it'd send a left request to the

person who is kicking and not to the person who was kicked

1 files changed, 11 insertions, 2 deletions

diff --git a/internal/server/api/api.go b/internal/server/api/api.go
index e52372b..2d70174 100644
--- a/internal/server/api/api.go
+++ b/internal/server/api/api.go
@@ -615,18 +615,27 @@ func SetMember(ctx context.Context, sess *session.Session, request *packet.SetMe
 	}
 
 	if !newMember.IsMember {
-		NetworkPropagate(ctx, sess, request.Network, &packet.MembersInfo{
+		membersInfoPayload := NetworkPropagateWithFilter(ctx, sess, request.Network, &packet.MembersInfo{
 			RemovedMembers: []snowflake.ID{newMember.UserID},
 			Members:        nil,
 			Users:          nil,
 			Network:        request.Network,
+		}, func(userId snowflake.ID) (pass bool) {
+			return userId != newMember.UserID
 		})
 
-		return &packet.NetworksInfo{
+		networksInfoPayload := &packet.NetworksInfo{
 			Networks:        nil,
 			RemovedNetworks: []snowflake.ID{request.Network},
 			Partial:         false,
 		}
+
+		if newMember.UserID == sess.ID() {
+			return networksInfoPayload
+		} else {
+			UserPropagate(ctx, sess, newMember.UserID, networksInfoPayload)
+			return membersInfoPayload
+		}
 	}
 
 	user, err := queries.GetUserById(ctx, newMember.UserID)