From 25623bf0c074ba351e0be26520ca53f21af4ff71 Mon Sep 17 00:00:00 2001
From: Sean DuBois <sean@siobud.com>
Date: Tue, 30 Jan 2024 20:51:36 -0500
Subject: [PATCH] Fix linter errors

---
 pkg/whip/relay_handler.go      | 2 +-
 pkg/whip/server.go             | 8 ++++----
 pkg/whip/whip_handler.go       | 2 +-
 pkg/whip/whip_track_handler.go | 5 +----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkg/whip/relay_handler.go b/pkg/whip/relay_handler.go
index b9e048ba..83ba399f 100644
--- a/pkg/whip/relay_handler.go
+++ b/pkg/whip/relay_handler.go
@@ -50,7 +50,7 @@ func (h *WHIPRelayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}()
 
-	path := strings.TrimLeft(r.URL.Path, "/whip/")
+	path := strings.TrimLeft(r.URL.Path, "/whip/") //nolint
 	v := strings.Split(path, "/")
 	if len(v) != 2 {
 		err = psrpc.NewErrorf(psrpc.NotFound, "invalid path")
diff --git a/pkg/whip/server.go b/pkg/whip/server.go
index 4be6de67..078ac897 100644
--- a/pkg/whip/server.go
+++ b/pkg/whip/server.go
@@ -213,7 +213,7 @@ func (s *WHIPServer) handleError(err error, w http.ResponseWriter) {
 	switch {
 	case errors.As(err, &psrpcErr):
 		w.WriteHeader(psrpcErr.ToHttp())
-		w.Write([]byte(psrpcErr.Error()))
+		_, _ = w.Write([]byte(psrpcErr.Error()))
 	case err == nil:
 		// Nothing, we already responded
 	default:
@@ -235,9 +235,9 @@ func (s *WHIPServer) handleNewWhipClient(w http.ResponseWriter, r *http.Request,
 		return err
 	}
 
-	logger.Debugw("new whip request", "streamKey", streamKey, "sdpOffer", string(sdpOffer.Bytes()))
+	logger.Debugw("new whip request", "streamKey", streamKey, "sdpOffer", sdpOffer.String())
 
-	resourceId, sdp, err := s.createStream(streamKey, string(sdpOffer.Bytes()))
+	resourceId, sdp, err := s.createStream(streamKey, sdpOffer.String())
 	if err != nil {
 		return err
 	}
@@ -246,7 +246,7 @@ func (s *WHIPServer) handleNewWhipClient(w http.ResponseWriter, r *http.Request,
 	w.Header().Set("Content-Type", "application/sdp")
 	w.Header().Set("Location", fmt.Sprintf("/%s/%s/%s", app, streamKey, resourceId))
 	w.WriteHeader(http.StatusCreated)
-	w.Write([]byte(sdp))
+	_, _ = w.Write([]byte(sdp))
 
 	return nil
 }
diff --git a/pkg/whip/whip_handler.go b/pkg/whip/whip_handler.go
index 40f58f43..bad92953 100644
--- a/pkg/whip/whip_handler.go
+++ b/pkg/whip/whip_handler.go
@@ -473,7 +473,7 @@ func newMediaEngine() (*webrtc.MediaEngine, error) {
 		}
 	}
 
-	videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}}
+	videoRTCPFeedback := []webrtc.RTCPFeedback{{Type: "goog-remb", Parameter: ""}, {Type: "ccm", Parameter: "fir"}, {Type: "nack", Parameter: ""}, {Type: "nack", Parameter: "pli"}}
 
 	for _, codec := range []webrtc.RTPCodecParameters{
 		{
diff --git a/pkg/whip/whip_track_handler.go b/pkg/whip/whip_track_handler.go
index 4f38eb7a..79f181ec 100644
--- a/pkg/whip/whip_track_handler.go
+++ b/pkg/whip/whip_track_handler.go
@@ -134,14 +134,12 @@ func (t *whipTrackHandler) startRTPReceiver(onDone func(err error)) {
 			select {
 			case <-t.fuse.Watch():
 				t.logger.Debugw("stopping rtp receiver")
-				err = nil
 				return
 			default:
 				err = t.processRTPPacket()
 				switch err {
 				case nil:
 				case io.EOF:
-					err = nil
 					return
 				default:
 					if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
@@ -256,7 +254,7 @@ func (t *whipTrackHandler) mediaWriterWorker(onDone func(err error)) {
 			case nil, errors.ErrPrerollBufferReset:
 				// continue
 			case io.EOF:
-				err = nil
+				err = nil //nolint
 				return
 			default:
 				t.logger.Warnw("error writing media", err)
@@ -287,7 +285,6 @@ func (t *whipTrackHandler) startRTCPReceiver() {
 				case err == nil:
 					// continue
 				case err == io.EOF:
-					err = nil
 					return
 				default:
 					if netErr, ok := err.(net.Error); ok && netErr.Timeout() {