Skip to content

Commit

Permalink
adding restricted to standard ok error prefixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
kehiy committed Jan 2, 2025
1 parent 36fa228 commit 4ae9c03
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion handler/req.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type filterQuery struct {
Limit uint32
}

func (h *Handler) HandleReq(f filter.Filter) ([]event.Event, error) {
func (h *Handler) HandleReq(f *filter.Filter) ([]event.Event, error) {
ctx, cancel := context.WithTimeout(context.Background(), h.db.QueryTimeout)
defer cancel()

Expand Down
2 changes: 1 addition & 1 deletion server/websocket/event_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func (s *Server) handleEvent(conn *websocket.Conn, m message.Message) { //nolint
return
}
}

_ = conn.WriteMessage(1, message.MakeOK(true, msg.Event.ID, ""))

_, err = s.redis.Client.BFAdd(qCtx, s.redis.BloomFilterName, eID[:]).Result()
Expand Down
2 changes: 1 addition & 1 deletion server/websocket/req_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (s *Server) handleReq(conn *websocket.Conn, m message.Message) {
return
}

res, err := s.handler.HandleReq(msg.Filter)
res, err := s.handler.HandleReq(&msg.Filter)
if err != nil {
_ = conn.WriteMessage(1, message.MakeNotice(fmt.Sprintf("error: can't process REQ message: %s", err.Error())))
status = databaseFail
Expand Down
4 changes: 2 additions & 2 deletions types/message/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (rm *Req) DecodeFromJSON(data []byte) error {
}
}
rm.SubscriptionID = arr[1].Str
rm.Filter = *new(filter.Filter)
rm.Filter = filter.Filter{}
if err := easyjson.Unmarshal([]byte(arr[2].Raw), &rm.Filter); err != nil {
return types.DecodeError{
Reason: fmt.Sprintf("REQ message: %s", err.Error()),
Expand All @@ -150,7 +150,7 @@ func (rm *Req) DecodeFromJSON(data []byte) error {
return nil
}

func (rm Req) EncodeToJSON() ([]byte, error) {
func (rm *Req) EncodeToJSON() ([]byte, error) {
return nil, nil
}

Expand Down

0 comments on commit 4ae9c03

Please sign in to comment.