summaryrefslogtreecommitdiff
path: root/internal/server
diff options
context:
space:
mode:
authorKyren223 <Kyren223@proton.me>2025-01-25 18:26:17 +0200
committerKyren223 <Kyren223@proton.me>2025-01-25 18:26:17 +0200
commit5c96cb4e606298c5a1ef05b5b2dcba099189d079 (patch)
treeec82527b8eeb9ba70a0bcd1b675f855bfe55b9bc /internal/server
parentacf87efce976744d61165e0b0174a1fadccfb779 (diff)
Added banlist on the client and fixed some server side issues with
banning
Diffstat (limited to 'internal/server')
-rw-r--r--internal/server/api/api.go4
-rw-r--r--internal/server/server.go2
2 files changed, 4 insertions, 2 deletions
diff --git a/internal/server/api/api.go b/internal/server/api/api.go
index 007cce5..3e9e5e5 100644
--- a/internal/server/api/api.go
+++ b/internal/server/api/api.go
@@ -629,7 +629,7 @@ func SetMember(ctx context.Context, sess *session.Session, request *packet.SetMe
return &ErrInternalError
}
- if !newMember.IsMember {
+ if !newMember.IsMember && member.IsMember {
membersInfoPayload := NetworkPropagateWithFilter(ctx, sess, request.Network, &packet.MembersInfo{
RemovedMembers: []snowflake.ID{newMember.UserID},
Members: nil,
@@ -693,7 +693,7 @@ func SetMember(ctx context.Context, sess *session.Session, request *packet.SetMe
}
}
- // Normal case, was already in the server
+ // Normal case, isMember wasn't changed
return payload
}
diff --git a/internal/server/server.go b/internal/server/server.go
index 3dcc16b..cf7dfcf 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -378,6 +378,8 @@ func processRequest(ctx context.Context, sess *session.Session, request packet.P
case *packet.RequestMessages:
response = timeout(50*time.Millisecond, api.RequestMessages, ctx, sess, request)
+ case *packet.GetBannedMembers:
+ response = timeout(10*time.Millisecond, api.GetBannedMembers, ctx, sess, request)
case *packet.SetMember:
response = timeout(50*time.Millisecond, api.SetMember, ctx, sess, request)