From a496d59fd64102b9aa8da8d86ee19d4eb8cbb547 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Mon, 10 Feb 2025 19:27:24 +0200 Subject: Implemented blocking on the server-side --- internal/server/server.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'internal/server/server.go') diff --git a/internal/server/server.go b/internal/server/server.go index 1477e7f..f4224c1 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -371,6 +371,9 @@ func processRequest(ctx context.Context, sess *session.Session, request packet.P case *packet.SetLastReadMessages: response = timeout(50*time.Millisecond, api.SetLastReadMessages, ctx, sess, request) + case *packet.BlockUser: + response = timeout(10*time.Millisecond, api.BlockUser, ctx, sess, request) + default: response = &packet.Error{Error: "use of disallowed packet type for request"} } @@ -418,7 +421,15 @@ func (server *server) sendInitialPackets(ctx context.Context, sess *session.Sess pkt := packet.NewPacket(packet.NewMsgPackEncoder(payload)) sess.Write(ctx, pkt) - payload = api.GetUserTrusteds(ctx, sess) + payload = api.GetTrustedUsers(ctx, sess) + if payload == &api.ErrInternalError { + return false + } + log.Println(sess.Addr(), "sending", payload.Type(), "payload:", payload) + pkt = packet.NewPacket(packet.NewMsgPackEncoder(payload)) + sess.Write(ctx, pkt) + + payload = api.GetBlockedUsers(ctx, sess) if payload == &api.ErrInternalError { return false } -- cgit v1.3.1