Start cleaning up linter errors. (#358)

* Start cleaning up linter errors. For #357

* Fix unmarshalling NullTime values

* More linter fixes

* Remove commented code

* Move defer up

* Consolidate error check lines

* Move error check to make sure row iteration was successful

* Cleaner error check + do not recreate pipe if it exists

* Consolidate hashing to generate client id

core/chat/chat.go

@@ -40,11 +40,8 @@ func Start() error {
 
 	ticker := time.NewTicker(30 * time.Second)
 	go func() {
-		for {
-			select {
-			case <-ticker.C:
-				_server.ping()
-			}
+		for range ticker.C {
+			_server.ping()
 		}
 	}()
 

core/chat/client.go

@@ -94,13 +94,21 @@ func (c *Client) listenWrite() {
 		select {
 		// Send a PING keepalive
 		case msg := <-c.pingch:
-			websocket.JSON.Send(c.ws, msg)
+			err := websocket.JSON.Send(c.ws, msg)
+			if err != nil {
+				log.Errorln(err)
+			}
 		// send message to the client
 		case msg := <-c.ch:
-			// log.Println("Send:", msg)
-			websocket.JSON.Send(c.ws, msg)
+			err := websocket.JSON.Send(c.ws, msg)
+			if err != nil {
+				log.Errorln(err)
+			}
 		case msg := <-c.usernameChangeChannel:
-			websocket.JSON.Send(c.ws, msg)
+			err := websocket.JSON.Send(c.ws, msg)
+			if err != nil {
+				log.Errorln(err)
+			}
 		// receive done request
 		case <-c.doneCh:
 			_server.remove(c)
@@ -114,7 +122,6 @@ func (c *Client) listenWrite() {
 func (c *Client) listenRead() {
 	for {
 		select {
-
 		// receive done request
 		case <-c.doneCh:
 			_server.remove(c)

core/chat/persistence.go

@@ -32,7 +32,10 @@ func createTable() {
 		log.Fatal(err)
 	}
 	defer stmt.Close()
-	stmt.Exec()
+	_, err = stmt.Exec()
+	if err != nil {
+		log.Warnln(err)
+	}
 }
 
 func addMessage(message models.ChatMessage) {
@@ -41,16 +44,20 @@ func addMessage(message models.ChatMessage) {
 		log.Fatal(err)
 	}
 	stmt, err := tx.Prepare("INSERT INTO messages(id, author, body, messageType, visible, timestamp) values(?, ?, ?, ?, ?, ?)")
+
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer stmt.Close()
+
 	_, err = stmt.Exec(message.ID, message.Author, message.Body, message.MessageType, 1, message.Timestamp)
 	if err != nil {
 		log.Fatal(err)
 	}
-	tx.Commit()
-
-	defer stmt.Close()
+	err = tx.Commit()
+	if err != nil {
+		log.Fatal(err)
+	}
 }
 
 func getChatHistory() []models.ChatMessage {
@@ -89,5 +96,9 @@ func getChatHistory() []models.ChatMessage {
 		history = append(history, message)
 	}
 
+	if err := rows.Err(); err != nil {
+		log.Fatal(err)
+	}
+
 	return history
 }

core/chat/server.go

@@ -46,11 +46,6 @@ func (s *server) SendToAll(msg models.ChatMessage) {
 	s.sendAllCh <- msg
 }
 
-// Done marks the server as done.
-func (s *server) done() {
-	s.doneCh <- true
-}
-
 // Err handles an error.
 func (s *server) err(err error) {
 	s.errCh <- err
@@ -140,18 +135,7 @@ func (s *server) sendWelcomeMessageToClient(c *Client) {
 		time.Sleep(7 * time.Second)
 
 		initialChatMessageText := fmt.Sprintf("Welcome to %s! %s", config.Config.InstanceDetails.Title, config.Config.InstanceDetails.Summary)
-		initialMessage := models.ChatMessage{"owncast-server", config.Config.InstanceDetails.Name, initialChatMessageText, "initial-message-1", "SYSTEM", true, time.Now()}
+		initialMessage := models.ChatMessage{ClientID: "owncast-server", Author: config.Config.InstanceDetails.Name, Body: initialChatMessageText, ID: "initial-message-1", MessageType: "SYSTEM", Visible: true, Timestamp: time.Now()}
 		c.Write(initialMessage)
 	}()
-
-}
-
-func (s *server) getClientForClientID(clientID string) *Client {
-	for _, client := range s.Clients {
-		if client.ClientID == clientID {
-			return client
-		}
-	}
-
-	return nil
 }