LogalDeveloper/owncast
0
Fork 0
Code Activity

style fix for error checking (#1170)

Browse Source 
+additional linting
This commit is contained in:
Meisam
2021-07-09 20:16:44 +02:00
committed by GitHub
parent a13e1e75e2
commit 7361578412
22 changed files with 62 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/chat/client.go
View File

@@ -92,24 +92,20 @@ func (c *Client) listenWrite() {
select {
// Send a PING keepalive
case msg := <-c.pingch:
err := websocket.JSON.Send(c.ws, msg)
if err != nil {
if err := websocket.JSON.Send(c.ws, msg); err != nil {
c.handleClientSocketError(err)
}
// send message to the client
case msg := <-c.ch:
err := websocket.JSON.Send(c.ws, msg)
if err != nil {
if err := websocket.JSON.Send(c.ws, msg); err != nil {
c.handleClientSocketError(err)
}
case msg := <-c.usernameChangeChannel:
err := websocket.JSON.Send(c.ws, msg)
if err != nil {
if err := websocket.JSON.Send(c.ws, msg); err != nil {
c.handleClientSocketError(err)
}
case msg := <-c.userJoinedChannel:
err := websocket.JSON.Send(c.ws, msg)
if err != nil {
if err := websocket.JSON.Send(c.ws, msg); err != nil {
c.handleClientSocketError(err)
}
@@ -148,8 +144,7 @@ func (c *Client) listenRead() {
// read data from websocket connection
default:
var data []byte
err := websocket.Message.Receive(c.ws, &data)
if err != nil {
if err := websocket.Message.Receive(c.ws, &data); err != nil {
if err == io.EOF {
c.doneCh <- true
return
@@ -162,10 +157,9 @@ func (c *Client) listenRead() {
}
var messageTypeCheck map[string]interface{}
err = json.Unmarshal(data, &messageTypeCheck)
// Bad messages should be thrown away
if err != nil {
if err := json.Unmarshal(data, &messageTypeCheck); err != nil {
log.Debugln("Badly formatted message received from", c.Username, c.ws.Request().RemoteAddr)
continue
}
@@ -207,8 +201,7 @@ func (c *Client) userJoined(data []byte) {
func (c *Client) userChangedName(data []byte) {
var msg models.NameChangeEvent
err := json.Unmarshal(data, &msg)
if err != nil {
if err := json.Unmarshal(data, &msg); err != nil {
log.Errorln(err)
}
msg.Type = models.UserNameChanged
@@ -219,8 +212,7 @@ func (c *Client) userChangedName(data []byte) {
func (c *Client) chatMessageReceived(data []byte) {
var msg models.ChatEvent
err := json.Unmarshal(data, &msg)
if err != nil {
if err := json.Unmarshal(data, &msg); err != nil {
log.Errorln(err)
}

14
core/chat/persistence.go
View File

@@ -33,8 +33,7 @@ func createTable() {
log.Fatal(err)
}
defer stmt.Close()
_, err = stmt.Exec()
if err != nil {
if _, err := stmt.Exec(); err != nil {
log.Warnln(err)
}
}
@@ -51,12 +50,10 @@ func addMessage(message models.ChatEvent) {
}
defer stmt.Close()
_, err = stmt.Exec(message.ID, message.Author, message.Body, message.MessageType, 1, message.Timestamp)
if err != nil {
if _, err := stmt.Exec(message.ID, message.Author, message.Body, message.MessageType, 1, message.Timestamp); err != nil {
log.Fatal(err)
}
err = tx.Commit()
if err != nil {
if err := tx.Commit(); err != nil {
log.Fatal(err)
}
}
@@ -133,13 +130,12 @@ func saveMessageVisibility(messageIDs []string, visible bool) error {
args[i+1] = id
}
_, err = stmt.Exec(args...)
if err != nil {
if _, err := stmt.Exec(args...); err != nil {
log.Fatal(err)
return err
}
if err = tx.Commit(); err != nil {
if err := tx.Commit(); err != nil {
log.Fatal(err)
return err
}